Convert Razor to use Reference (dotnet/aspnetcore#4954)

Commit migrated from dotnet/aspnetcore@b079041488f0
dougbu · Dec 17, 2018 · 7a891e5 · 7a891e5
1 parent 5820cb3
commit 7a891e5
Show file tree

Hide file tree

Showing 1,705 changed files with 601 additions and 15,108 deletions.
diff --git a/src/.gitignore b/src/.gitignore
diff --git a/...Razor/AssemblyIdentityEqualityComparer.cs → ...r/src/AssemblyIdentityEqualityComparer.cs b/...Razor/AssemblyIdentityEqualityComparer.cs → ...r/src/AssemblyIdentityEqualityComparer.cs
diff --git a/...ysis.Razor/CompilationTagHelperFeature.cs → ....Razor/src/CompilationTagHelperFeature.cs b/...ysis.Razor/CompilationTagHelperFeature.cs → ....Razor/src/CompilationTagHelperFeature.cs
diff --git a/....Razor/DefaultMetadataReferenceFeature.cs → ...or/src/DefaultMetadataReferenceFeature.cs b/....Razor/DefaultMetadataReferenceFeature.cs → ...or/src/DefaultMetadataReferenceFeature.cs
diff --git a/...azor/DefaultTagHelperDescriptorFactory.cs → .../src/DefaultTagHelperDescriptorFactory.cs b/...azor/DefaultTagHelperDescriptorFactory.cs → .../src/DefaultTagHelperDescriptorFactory.cs
diff --git a/...zor/DefaultTagHelperDescriptorProvider.cs → ...src/DefaultTagHelperDescriptorProvider.cs b/...zor/DefaultTagHelperDescriptorProvider.cs → ...src/DefaultTagHelperDescriptorProvider.cs
diff --git a/...ft.CodeAnalysis.Razor/FilePathComparer.cs → ...odeAnalysis.Razor/src/FilePathComparer.cs b/...ft.CodeAnalysis.Razor/FilePathComparer.cs → ...odeAnalysis.Razor/src/FilePathComparer.cs
diff --git a/...alysis.Razor/IMetadataReferenceFeature.cs → ...is.Razor/src/IMetadataReferenceFeature.cs b/...alysis.Razor/IMetadataReferenceFeature.cs → ...is.Razor/src/IMetadataReferenceFeature.cs
diff --git a/src/CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj b/src/CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj
@@ -0,0 +1,21 @@
+<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>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Razor.Language" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.CodeAnalysis.Common" />
+    <Reference Include="Microsoft.CodeAnalysis.CSharp" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
+  </ItemGroup>
+
+</Project>
diff --git a/...Analysis.Razor/Properties/AssemblyInfo.cs → ...ysis.Razor/src/Properties/AssemblyInfo.cs b/...Analysis.Razor/Properties/AssemblyInfo.cs → ...ysis.Razor/src/Properties/AssemblyInfo.cs
diff --git a/...is.Razor/Properties/Resources.Designer.cs → ...azor/src/Properties/Resources.Designer.cs b/...is.Razor/Properties/Resources.Designer.cs → ...azor/src/Properties/Resources.Designer.cs
diff --git a/...eAnalysis.Razor/RazorDiagnosticFactory.cs → ...lysis.Razor/src/RazorDiagnosticFactory.cs b/...eAnalysis.Razor/RazorDiagnosticFactory.cs → ...lysis.Razor/src/RazorDiagnosticFactory.cs
diff --git a/...osoft.CodeAnalysis.Razor/RazorLanguage.cs → src/CodeAnalysis.Razor/src/RazorLanguage.cs b/...osoft.CodeAnalysis.Razor/RazorLanguage.cs → src/CodeAnalysis.Razor/src/RazorLanguage.cs
diff --git a/...Analysis.Razor/RequiredAttributeParser.cs → ...ysis.Razor/src/RequiredAttributeParser.cs b/...Analysis.Razor/RequiredAttributeParser.cs → ...ysis.Razor/src/RequiredAttributeParser.cs
diff --git a/...crosoft.CodeAnalysis.Razor/Resources.resx → src/CodeAnalysis.Razor/src/Resources.resx b/...crosoft.CodeAnalysis.Razor/Resources.resx → src/CodeAnalysis.Razor/src/Resources.resx
diff --git a/...perDescriptorProviderContextExtensions.cs → ...perDescriptorProviderContextExtensions.cs b/...perDescriptorProviderContextExtensions.cs → ...perDescriptorProviderContextExtensions.cs
diff --git a/...odeAnalysis.Razor/TagHelperTypeVisitor.cs → ...nalysis.Razor/src/TagHelperTypeVisitor.cs b/...odeAnalysis.Razor/TagHelperTypeVisitor.cs → ...nalysis.Razor/src/TagHelperTypeVisitor.cs
diff --git a/...soft.CodeAnalysis.Razor/TagHelperTypes.cs → src/CodeAnalysis.Razor/src/TagHelperTypes.cs b/...soft.CodeAnalysis.Razor/TagHelperTypes.cs → src/CodeAnalysis.Razor/src/TagHelperTypes.cs
diff --git a/...odeAnalysis.Razor/TextChangeExtensions.cs → ...nalysis.Razor/src/TextChangeExtensions.cs b/...odeAnalysis.Razor/TextChangeExtensions.cs → ...nalysis.Razor/src/TextChangeExtensions.cs
diff --git a/....CodeAnalysis.Razor/TextSpanExtensions.cs → ...eAnalysis.Razor/src/TextSpanExtensions.cs b/....CodeAnalysis.Razor/TextSpanExtensions.cs → ...eAnalysis.Razor/src/TextSpanExtensions.cs
diff --git a/....CodeAnalysis.Razor/baseline.netcore.json → ...eAnalysis.Razor/src/baseline.netcore.json b/....CodeAnalysis.Razor/baseline.netcore.json → ...eAnalysis.Razor/src/baseline.netcore.json
diff --git a/...Analysis.Razor/baseline.netframework.json → ...ysis.Razor/src/baseline.netframework.json b/...Analysis.Razor/baseline.netframework.json → ...ysis.Razor/src/baseline.netframework.json
diff --git a/.../DefaultTagHelperDescriptorFactoryTest.cs → .../DefaultTagHelperDescriptorFactoryTest.cs b/.../DefaultTagHelperDescriptorFactoryTest.cs → .../DefaultTagHelperDescriptorFactoryTest.cs
diff --git a/...DefaultTagHelperDescriptorProviderTest.cs → ...DefaultTagHelperDescriptorProviderTest.cs b/...DefaultTagHelperDescriptorProviderTest.cs → ...DefaultTagHelperDescriptorProviderTest.cs
diff --git a/src/CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj b/src/CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj
@@ -0,0 +1,27 @@
+<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>
+    <Reference Include="Microsoft.CodeAnalysis.Razor" />
+    <Reference Include="Microsoft.AspNetCore.Razor.Language" />
+    <Reference Include="Microsoft.AspNetCore.Razor.Runtime" />
+    <Reference Include="Microsoft.AspNetCore.Razor" />
+    <Reference Include="Microsoft.AspNetCore.Razor.Test.Common" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp" />
+    <Reference Include="Microsoft.Extensions.DependencyModel" />
+  </ItemGroup>
+
+</Project>
diff --git a/...t/TagHelperDescriptorFactoryTagHelpers.cs → ...t/TagHelperDescriptorFactoryTagHelpers.cs b/...t/TagHelperDescriptorFactoryTagHelpers.cs → ...t/TagHelperDescriptorFactoryTagHelpers.cs
diff --git a/...is.Razor.Test/TagHelperTypeVisitorTest.cs → ...is.Razor/test/TagHelperTypeVisitorTest.cs b/...is.Razor.Test/TagHelperTypeVisitorTest.cs → ...is.Razor/test/TagHelperTypeVisitorTest.cs
diff --git a/...CodeAnalysis.Razor.Test/xunit.runner.json → ...CodeAnalysis.Razor/test/xunit.runner.json b/...CodeAnalysis.Razor.Test/xunit.runner.json → ...CodeAnalysis.Razor/test/xunit.runner.json
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
diff --git a/...Extensions.Version1_X/CSharpIdentifier.cs → ...nsions.Version1_X/src/CSharpIdentifier.cs b/...Extensions.Version1_X/CSharpIdentifier.cs → ...nsions.Version1_X/src/CSharpIdentifier.cs
diff --git a/...nsions.Version1_X/ExtensionInitializer.cs → ...ns.Version1_X/src/ExtensionInitializer.cs b/...nsions.Version1_X/ExtensionInitializer.cs → ...ns.Version1_X/src/ExtensionInitializer.cs
diff --git a/...ions.Version1_X/IInjectTargetExtension.cs → ....Version1_X/src/IInjectTargetExtension.cs b/...ions.Version1_X/IInjectTargetExtension.cs → ....Version1_X/src/IInjectTargetExtension.cs
diff --git a/...IViewComponentTagHelperTargetExtension.cs → ...IViewComponentTagHelperTargetExtension.cs b/...IViewComponentTagHelperTargetExtension.cs → ...IViewComponentTagHelperTargetExtension.cs
diff --git a/....Extensions.Version1_X/InjectDirective.cs → ...ensions.Version1_X/src/InjectDirective.cs b/....Extensions.Version1_X/InjectDirective.cs → ...ensions.Version1_X/src/InjectDirective.cs
diff --git a/...ions.Version1_X/InjectIntermediateNode.cs → ....Version1_X/src/InjectIntermediateNode.cs b/...ions.Version1_X/InjectIntermediateNode.cs → ....Version1_X/src/InjectIntermediateNode.cs
diff --git a/...sions.Version1_X/InjectTargetExtension.cs → ...s.Version1_X/src/InjectTargetExtension.cs b/...sions.Version1_X/InjectTargetExtension.cs → ...s.Version1_X/src/InjectTargetExtension.cs
diff --git a/...ersion1_X/LegacySectionTargetExtension.cs → ...on1_X/src/LegacySectionTargetExtension.cs b/...ersion1_X/LegacySectionTargetExtension.cs → ...on1_X/src/LegacySectionTargetExtension.cs
diff --git a/...re.Mvc.Razor.Extensions.Version1_X.csproj → ...re.Mvc.Razor.Extensions.Version1_X.csproj b/...re.Mvc.Razor.Extensions.Version1_X.csproj → ...re.Mvc.Razor.Extensions.Version1_X.csproj
@@ -5,17 +5,19 @@
     <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <PackageTags>$(PackageTags);aspnetcoremvc</PackageTags>
     <EnableApiCheck>false</EnableApiCheck>
+    <IsImplementationProject>false</IsImplementationProject>
+    <IsProjectReferenceProvider>true</IsProjectReferenceProvider>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Microsoft.AspNetCore.Razor.Language\CodeGeneration\CodeWriterExtensions.cs">
+    <Compile Include="..\..\Razor.Language\src\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" />
+    <Reference Include="Microsoft.AspNetCore.Razor.Language" />
+    <Reference Include="Microsoft.CodeAnalysis.Razor" />
   </ItemGroup>
 
 </Project>
diff --git a/...r.Extensions.Version1_X/ModelDirective.cs → ...tensions.Version1_X/src/ModelDirective.cs b/...r.Extensions.Version1_X/ModelDirective.cs → ...tensions.Version1_X/src/ModelDirective.cs
diff --git a/...ensions.Version1_X/ModelExpressionPass.cs → ...ons.Version1_X/src/ModelExpressionPass.cs b/...ensions.Version1_X/ModelExpressionPass.cs → ...ons.Version1_X/src/ModelExpressionPass.cs
diff --git a/...ons.Version1_X/MvcImportProjectFeature.cs → ...Version1_X/src/MvcImportProjectFeature.cs b/...ons.Version1_X/MvcImportProjectFeature.cs → ...Version1_X/src/MvcImportProjectFeature.cs
diff --git a/...ions.Version1_X/MvcRazorTemplateEngine.cs → ....Version1_X/src/MvcRazorTemplateEngine.cs b/...ions.Version1_X/MvcRazorTemplateEngine.cs → ....Version1_X/src/MvcRazorTemplateEngine.cs
diff --git a/...rsion1_X/MvcViewDocumentClassifierPass.cs → ...n1_X/src/MvcViewDocumentClassifierPass.cs b/...rsion1_X/MvcViewDocumentClassifierPass.cs → ...n1_X/src/MvcViewDocumentClassifierPass.cs
diff --git a/...ons.Version1_X/Properties/AssemblyInfo.cs → ...Version1_X/src/Properties/AssemblyInfo.cs b/...ons.Version1_X/Properties/AssemblyInfo.cs → ...Version1_X/src/Properties/AssemblyInfo.cs
diff --git a/...rsion1_X/Properties/Resources.Designer.cs → ...n1_X/src/Properties/Resources.Designer.cs b/...rsion1_X/Properties/Resources.Designer.cs → ...n1_X/src/Properties/Resources.Designer.cs
diff --git a/...erties/ViewComponentResources.Designer.cs → ...erties/ViewComponentResources.Designer.cs b/...erties/ViewComponentResources.Designer.cs → ...erties/ViewComponentResources.Designer.cs
diff --git a/....Extensions.Version1_X/RazorExtensions.cs → ...ensions.Version1_X/src/RazorExtensions.cs b/....Extensions.Version1_X/RazorExtensions.cs → ...ensions.Version1_X/src/RazorExtensions.cs
diff --git a/...on1_X/RazorExtensionsDiagnosticFactory.cs → ...X/src/RazorExtensionsDiagnosticFactory.cs b/...on1_X/RazorExtensionsDiagnosticFactory.cs → ...X/src/RazorExtensionsDiagnosticFactory.cs
diff --git a/...azor.Extensions.Version1_X/Resources.resx → ....Extensions.Version1_X/src/Resources.resx b/...azor.Extensions.Version1_X/Resources.resx → ....Extensions.Version1_X/src/Resources.resx
diff --git a/...rsion1_X/TagHelperDescriptorExtensions.cs → ...n1_X/src/TagHelperDescriptorExtensions.cs b/...rsion1_X/TagHelperDescriptorExtensions.cs → ...n1_X/src/TagHelperDescriptorExtensions.cs
diff --git a/...ns.Version1_X/ViewComponentResources.resx → ...ersion1_X/src/ViewComponentResources.resx b/...ns.Version1_X/ViewComponentResources.resx → ...ersion1_X/src/ViewComponentResources.resx
diff --git a/...n1_X/ViewComponentTagHelperConventions.cs → .../src/ViewComponentTagHelperConventions.cs b/...n1_X/ViewComponentTagHelperConventions.cs → .../src/ViewComponentTagHelperConventions.cs
diff --git a/...iewComponentTagHelperDescriptorFactory.cs → ...iewComponentTagHelperDescriptorFactory.cs b/...iewComponentTagHelperDescriptorFactory.cs → ...iewComponentTagHelperDescriptorFactory.cs
diff --git a/...ewComponentTagHelperDescriptorProvider.cs → ...ewComponentTagHelperDescriptorProvider.cs b/...ewComponentTagHelperDescriptorProvider.cs → ...ewComponentTagHelperDescriptorProvider.cs
diff --git a/...ViewComponentTagHelperIntermediateNode.cs → ...ViewComponentTagHelperIntermediateNode.cs b/...ViewComponentTagHelperIntermediateNode.cs → ...ViewComponentTagHelperIntermediateNode.cs
diff --git a/...sion1_X/ViewComponentTagHelperMetadata.cs → ...1_X/src/ViewComponentTagHelperMetadata.cs b/...sion1_X/ViewComponentTagHelperMetadata.cs → ...1_X/src/ViewComponentTagHelperMetadata.cs
diff --git a/....Version1_X/ViewComponentTagHelperPass.cs → ...sion1_X/src/ViewComponentTagHelperPass.cs b/....Version1_X/ViewComponentTagHelperPass.cs → ...sion1_X/src/ViewComponentTagHelperPass.cs
diff --git a/.../ViewComponentTagHelperTargetExtension.cs → .../ViewComponentTagHelperTargetExtension.cs b/.../ViewComponentTagHelperTargetExtension.cs → .../ViewComponentTagHelperTargetExtension.cs
diff --git a/...ns.Version1_X/ViewComponentTypeVisitor.cs → ...ersion1_X/src/ViewComponentTypeVisitor.cs b/...ns.Version1_X/ViewComponentTypeVisitor.cs → ...ersion1_X/src/ViewComponentTypeVisitor.cs
diff --git a/...tensions.Version1_X/ViewComponentTypes.cs → ...ions.Version1_X/src/ViewComponentTypes.cs b/...tensions.Version1_X/ViewComponentTypes.cs → ...ions.Version1_X/src/ViewComponentTypes.cs
diff --git a/...ns.Version1_X.Test/InjectDirectiveTest.cs → ...ns.Version1_X/test/InjectDirectiveTest.cs b/...ns.Version1_X.Test/InjectDirectiveTest.cs → ...ns.Version1_X/test/InjectDirectiveTest.cs
diff --git a/...sion1_X.Test/InjectTargetExtensionTest.cs → ...sion1_X/test/InjectTargetExtensionTest.cs b/...sion1_X.Test/InjectTargetExtensionTest.cs → ...sion1_X/test/InjectTargetExtensionTest.cs
diff --git a/...ionTests/CodeGenerationIntegrationTest.cs → ...ionTests/CodeGenerationIntegrationTest.cs b/...ionTests/CodeGenerationIntegrationTest.cs → ...ionTests/CodeGenerationIntegrationTest.cs
diff --git a/....Test/LegacySectionTargetExtensionTest.cs → .../test/LegacySectionTargetExtensionTest.cs b/....Test/LegacySectionTargetExtensionTest.cs → .../test/LegacySectionTargetExtensionTest.cs
diff --git a/...tensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj b/...tensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
@@ -0,0 +1,38 @@
+<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>
+    <Reference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" />
+    <Reference Include="Microsoft.AspNetCore.Razor.Test.Common" />
+    <Reference Include="Microsoft.AspNetCore.Razor.Runtime" />
+    <Reference Include="Microsoft.CodeAnalysis.Razor" />
+    <Reference Include="Microsoft.CodeAnalysis.CSharp" />
+    <Reference Include="Microsoft.Extensions.DependencyModel" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- We need this to compile but don't want it referenced by the project. It is included dynamically in CodeGeneration tests. -->
+    <Reference Include="Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X" />
+
+    <!-- Due to how DependencyContext.Load handles our special MvcShim reference above we need to also reference the MvcShim's DiagnosticSource dependency -->
+    <Reference Include="System.Diagnostics.DiagnosticSource" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <MvcShim Condition="$(TargetFramework) != ''" Include="..\..\test\testassets\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/...ons.Version1_X.Test/ModelDirectiveTest.cs → ...ons.Version1_X/test/ModelDirectiveTest.cs b/...ons.Version1_X.Test/ModelDirectiveTest.cs → ...ons.Version1_X/test/ModelDirectiveTest.cs
diff --git a/...ersion1_X.Test/ModelExpressionPassTest.cs → ...ersion1_X/test/ModelExpressionPassTest.cs b/...ersion1_X.Test/ModelExpressionPassTest.cs → ...ersion1_X/test/ModelExpressionPassTest.cs
diff --git a/...on1_X.Test/MvcImportProjectFeatureTest.cs → ...on1_X/test/MvcImportProjectFeatureTest.cs b/...on1_X.Test/MvcImportProjectFeatureTest.cs → ...on1_X/test/MvcImportProjectFeatureTest.cs
diff --git a/...ion1_X.Test/MvcRazorTemplateEngineTest.cs → ...ion1_X/test/MvcRazorTemplateEngineTest.cs b/...ion1_X.Test/MvcRazorTemplateEngineTest.cs → ...ion1_X/test/MvcRazorTemplateEngineTest.cs
diff --git a/...zor.Extensions.Version1_X.Test/MvcShim.cs → ...zor.Extensions.Version1_X/test/MvcShim.cs b/...zor.Extensions.Version1_X.Test/MvcShim.cs → ...zor.Extensions.Version1_X/test/MvcShim.cs
diff --git a/...Test/MvcViewDocumentClassifierPassTest.cs → ...test/MvcViewDocumentClassifierPassTest.cs b/...Test/MvcViewDocumentClassifierPassTest.cs → ...test/MvcViewDocumentClassifierPassTest.cs
diff --git a/...xtensions.Test/Properties/AssemblyInfo.cs → ...ersion1_X/test/Properties/AssemblyInfo.cs b/...xtensions.Test/Properties/AssemblyInfo.cs → ...ersion1_X/test/Properties/AssemblyInfo.cs
diff --git a/...rsion1_X.Test/SourceMappingsSerializer.cs → ...rsion1_X/test/SourceMappingsSerializer.cs b/...rsion1_X.Test/SourceMappingsSerializer.cs → ...rsion1_X/test/SourceMappingsSerializer.cs
diff --git a/...Test/TagHelperDescriptorExtensionsTest.cs → ...test/TagHelperDescriptorExtensionsTest.cs b/...Test/TagHelperDescriptorExtensionsTest.cs → ...test/TagHelperDescriptorExtensionsTest.cs
diff --git a/...odeGenerationIntegrationTest/Basic.cshtml → ...odeGenerationIntegrationTest/Basic.cshtml b/...odeGenerationIntegrationTest/Basic.cshtml → ...odeGenerationIntegrationTest/Basic.cshtml
diff --git a/...tegrationTest/Basic_DesignTime.codegen.cs → ...tegrationTest/Basic_DesignTime.codegen.cs b/...tegrationTest/Basic_DesignTime.codegen.cs → ...tegrationTest/Basic_DesignTime.codegen.cs
diff --git a/...onIntegrationTest/Basic_DesignTime.ir.txt → ...onIntegrationTest/Basic_DesignTime.ir.txt b/...onIntegrationTest/Basic_DesignTime.ir.txt → ...onIntegrationTest/Basic_DesignTime.ir.txt
diff --git a/...grationTest/Basic_DesignTime.mappings.txt → ...grationTest/Basic_DesignTime.mappings.txt b/...grationTest/Basic_DesignTime.mappings.txt → ...grationTest/Basic_DesignTime.mappings.txt
diff --git a/...nIntegrationTest/Basic_Runtime.codegen.cs → ...nIntegrationTest/Basic_Runtime.codegen.cs b/...nIntegrationTest/Basic_Runtime.codegen.cs → ...nIntegrationTest/Basic_Runtime.codegen.cs
diff --git a/...ationIntegrationTest/Basic_Runtime.ir.txt → ...ationIntegrationTest/Basic_Runtime.ir.txt b/...ationIntegrationTest/Basic_Runtime.ir.txt → ...ationIntegrationTest/Basic_Runtime.ir.txt
diff --git a/...tegrationTest/IncompleteDirectives.cshtml → ...tegrationTest/IncompleteDirectives.cshtml b/...tegrationTest/IncompleteDirectives.cshtml → ...tegrationTest/IncompleteDirectives.cshtml
diff --git a/...ncompleteDirectives_DesignTime.codegen.cs → ...ncompleteDirectives_DesignTime.codegen.cs b/...ncompleteDirectives_DesignTime.codegen.cs → ...ncompleteDirectives_DesignTime.codegen.cs
diff --git a/...leteDirectives_DesignTime.diagnostics.txt → ...leteDirectives_DesignTime.diagnostics.txt b/...leteDirectives_DesignTime.diagnostics.txt → ...leteDirectives_DesignTime.diagnostics.txt
diff --git a/...st/IncompleteDirectives_DesignTime.ir.txt → ...st/IncompleteDirectives_DesignTime.ir.txt b/...st/IncompleteDirectives_DesignTime.ir.txt → ...st/IncompleteDirectives_DesignTime.ir.txt
diff --git a/...ompleteDirectives_DesignTime.mappings.txt → ...ompleteDirectives_DesignTime.mappings.txt b/...ompleteDirectives_DesignTime.mappings.txt → ...ompleteDirectives_DesignTime.mappings.txt
diff --git a/...t/IncompleteDirectives_Runtime.codegen.cs → ...t/IncompleteDirectives_Runtime.codegen.cs b/...t/IncompleteDirectives_Runtime.codegen.cs → ...t/IncompleteDirectives_Runtime.codegen.cs
diff --git a/...ompleteDirectives_Runtime.diagnostics.txt → ...ompleteDirectives_Runtime.diagnostics.txt b/...ompleteDirectives_Runtime.diagnostics.txt → ...ompleteDirectives_Runtime.diagnostics.txt
diff --git a/...nTest/IncompleteDirectives_Runtime.ir.txt → ...nTest/IncompleteDirectives_Runtime.ir.txt b/...nTest/IncompleteDirectives_Runtime.ir.txt → ...nTest/IncompleteDirectives_Runtime.ir.txt
diff --git a/...nIntegrationTest/InheritsViewModel.cshtml → ...nIntegrationTest/InheritsViewModel.cshtml b/...nIntegrationTest/InheritsViewModel.cshtml → ...nIntegrationTest/InheritsViewModel.cshtml
diff --git a/...t/InheritsViewModel_DesignTime.codegen.cs → ...t/InheritsViewModel_DesignTime.codegen.cs b/...t/InheritsViewModel_DesignTime.codegen.cs → ...t/InheritsViewModel_DesignTime.codegen.cs
diff --git a/...nTest/InheritsViewModel_DesignTime.ir.txt → ...nTest/InheritsViewModel_DesignTime.ir.txt b/...nTest/InheritsViewModel_DesignTime.ir.txt → ...nTest/InheritsViewModel_DesignTime.ir.txt
diff --git a/...InheritsViewModel_DesignTime.mappings.txt → ...InheritsViewModel_DesignTime.mappings.txt b/...InheritsViewModel_DesignTime.mappings.txt → ...InheritsViewModel_DesignTime.mappings.txt
diff --git a/...Test/InheritsViewModel_Runtime.codegen.cs → ...Test/InheritsViewModel_Runtime.codegen.cs b/...Test/InheritsViewModel_Runtime.codegen.cs → ...Test/InheritsViewModel_Runtime.codegen.cs
diff --git a/...tionTest/InheritsViewModel_Runtime.ir.txt → ...tionTest/InheritsViewModel_Runtime.ir.txt b/...tionTest/InheritsViewModel_Runtime.ir.txt → ...tionTest/InheritsViewModel_Runtime.ir.txt
diff --git a/...rationTest/InheritsWithViewImports.cshtml → ...rationTest/InheritsWithViewImports.cshtml b/...rationTest/InheritsWithViewImports.cshtml → ...rationTest/InheritsWithViewImports.cshtml
diff --git a/...ritsWithViewImports_DesignTime.codegen.cs → ...ritsWithViewImports_DesignTime.codegen.cs b/...ritsWithViewImports_DesignTime.codegen.cs → ...ritsWithViewImports_DesignTime.codegen.cs
diff --git a/...InheritsWithViewImports_DesignTime.ir.txt → ...InheritsWithViewImports_DesignTime.ir.txt b/...InheritsWithViewImports_DesignTime.ir.txt → ...InheritsWithViewImports_DesignTime.ir.txt
diff --git a/...tsWithViewImports_DesignTime.mappings.txt → ...tsWithViewImports_DesignTime.mappings.txt b/...tsWithViewImports_DesignTime.mappings.txt → ...tsWithViewImports_DesignTime.mappings.txt
diff --git a/...t/InheritsWithViewImports_Imports0.cshtml → ...t/InheritsWithViewImports_Imports0.cshtml b/...t/InheritsWithViewImports_Imports0.cshtml → ...t/InheritsWithViewImports_Imports0.cshtml
diff --git a/...nheritsWithViewImports_Runtime.codegen.cs → ...nheritsWithViewImports_Runtime.codegen.cs b/...nheritsWithViewImports_Runtime.codegen.cs → ...nheritsWithViewImports_Runtime.codegen.cs
diff --git a/...st/InheritsWithViewImports_Runtime.ir.txt → ...st/InheritsWithViewImports_Runtime.ir.txt b/...st/InheritsWithViewImports_Runtime.ir.txt → ...st/InheritsWithViewImports_Runtime.ir.txt
diff --git a/...deGenerationIntegrationTest/Inject.cshtml → ...deGenerationIntegrationTest/Inject.cshtml b/...deGenerationIntegrationTest/Inject.cshtml → ...deGenerationIntegrationTest/Inject.cshtml
diff --git a/...ionIntegrationTest/InjectWithModel.cshtml → ...ionIntegrationTest/InjectWithModel.cshtml b/...ionIntegrationTest/InjectWithModel.cshtml → ...ionIntegrationTest/InjectWithModel.cshtml
diff --git a/...est/InjectWithModel_DesignTime.codegen.cs → ...est/InjectWithModel_DesignTime.codegen.cs b/...est/InjectWithModel_DesignTime.codegen.cs → ...est/InjectWithModel_DesignTime.codegen.cs
diff --git a/...ionTest/InjectWithModel_DesignTime.ir.txt → ...ionTest/InjectWithModel_DesignTime.ir.txt b/...ionTest/InjectWithModel_DesignTime.ir.txt → ...ionTest/InjectWithModel_DesignTime.ir.txt
diff --git a/...t/InjectWithModel_DesignTime.mappings.txt → ...t/InjectWithModel_DesignTime.mappings.txt b/...t/InjectWithModel_DesignTime.mappings.txt → ...t/InjectWithModel_DesignTime.mappings.txt
diff --git a/...onTest/InjectWithModel_Runtime.codegen.cs → ...onTest/InjectWithModel_Runtime.codegen.cs b/...onTest/InjectWithModel_Runtime.codegen.cs → ...onTest/InjectWithModel_Runtime.codegen.cs
diff --git a/...rationTest/InjectWithModel_Runtime.ir.txt → ...rationTest/InjectWithModel_Runtime.ir.txt b/...rationTest/InjectWithModel_Runtime.ir.txt → ...rationTest/InjectWithModel_Runtime.ir.txt
diff --git a/...ntegrationTest/InjectWithSemicolon.cshtml → ...ntegrationTest/InjectWithSemicolon.cshtml b/...ntegrationTest/InjectWithSemicolon.cshtml → ...ntegrationTest/InjectWithSemicolon.cshtml
diff --git a/...InjectWithSemicolon_DesignTime.codegen.cs → ...InjectWithSemicolon_DesignTime.codegen.cs b/...InjectWithSemicolon_DesignTime.codegen.cs → ...InjectWithSemicolon_DesignTime.codegen.cs
diff --git a/...est/InjectWithSemicolon_DesignTime.ir.txt → ...est/InjectWithSemicolon_DesignTime.ir.txt b/...est/InjectWithSemicolon_DesignTime.ir.txt → ...est/InjectWithSemicolon_DesignTime.ir.txt
diff --git a/...jectWithSemicolon_DesignTime.mappings.txt → ...jectWithSemicolon_DesignTime.mappings.txt b/...jectWithSemicolon_DesignTime.mappings.txt → ...jectWithSemicolon_DesignTime.mappings.txt
diff --git a/...st/InjectWithSemicolon_Runtime.codegen.cs → ...st/InjectWithSemicolon_Runtime.codegen.cs b/...st/InjectWithSemicolon_Runtime.codegen.cs → ...st/InjectWithSemicolon_Runtime.codegen.cs
diff --git a/...onTest/InjectWithSemicolon_Runtime.ir.txt → ...onTest/InjectWithSemicolon_Runtime.ir.txt b/...onTest/InjectWithSemicolon_Runtime.ir.txt → ...onTest/InjectWithSemicolon_Runtime.ir.txt
diff --git a/...egrationTest/Inject_DesignTime.codegen.cs → ...egrationTest/Inject_DesignTime.codegen.cs b/...egrationTest/Inject_DesignTime.codegen.cs → ...egrationTest/Inject_DesignTime.codegen.cs
diff --git a/...nIntegrationTest/Inject_DesignTime.ir.txt → ...nIntegrationTest/Inject_DesignTime.ir.txt b/...nIntegrationTest/Inject_DesignTime.ir.txt → ...nIntegrationTest/Inject_DesignTime.ir.txt
diff --git a/...rationTest/Inject_DesignTime.mappings.txt → ...rationTest/Inject_DesignTime.mappings.txt b/...rationTest/Inject_DesignTime.mappings.txt → ...rationTest/Inject_DesignTime.mappings.txt
diff --git a/...IntegrationTest/Inject_Runtime.codegen.cs → ...IntegrationTest/Inject_Runtime.codegen.cs b/...IntegrationTest/Inject_Runtime.codegen.cs → ...IntegrationTest/Inject_Runtime.codegen.cs
diff --git a/...tionIntegrationTest/Inject_Runtime.ir.txt → ...tionIntegrationTest/Inject_Runtime.ir.txt b/...tionIntegrationTest/Inject_Runtime.ir.txt → ...tionIntegrationTest/Inject_Runtime.ir.txt
diff --git a/...egrationTest/InvalidNamespaceAtEOF.cshtml → ...egrationTest/InvalidNamespaceAtEOF.cshtml b/...egrationTest/InvalidNamespaceAtEOF.cshtml → ...egrationTest/InvalidNamespaceAtEOF.cshtml
diff --git a/...validNamespaceAtEOF_DesignTime.codegen.cs → ...validNamespaceAtEOF_DesignTime.codegen.cs b/...validNamespaceAtEOF_DesignTime.codegen.cs → ...validNamespaceAtEOF_DesignTime.codegen.cs
diff --git a/...NamespaceAtEOF_DesignTime.diagnostics.txt → ...NamespaceAtEOF_DesignTime.diagnostics.txt b/...NamespaceAtEOF_DesignTime.diagnostics.txt → ...NamespaceAtEOF_DesignTime.diagnostics.txt
diff --git a/...t/InvalidNamespaceAtEOF_DesignTime.ir.txt → ...t/InvalidNamespaceAtEOF_DesignTime.ir.txt b/...t/InvalidNamespaceAtEOF_DesignTime.ir.txt → ...t/InvalidNamespaceAtEOF_DesignTime.ir.txt
diff --git a/...lidNamespaceAtEOF_DesignTime.mappings.txt → ...lidNamespaceAtEOF_DesignTime.mappings.txt b/...lidNamespaceAtEOF_DesignTime.mappings.txt → ...lidNamespaceAtEOF_DesignTime.mappings.txt
diff --git a/.../InvalidNamespaceAtEOF_Runtime.codegen.cs → .../InvalidNamespaceAtEOF_Runtime.codegen.cs b/.../InvalidNamespaceAtEOF_Runtime.codegen.cs → .../InvalidNamespaceAtEOF_Runtime.codegen.cs
diff --git a/...lidNamespaceAtEOF_Runtime.diagnostics.txt → ...lidNamespaceAtEOF_Runtime.diagnostics.txt b/...lidNamespaceAtEOF_Runtime.diagnostics.txt → ...lidNamespaceAtEOF_Runtime.diagnostics.txt
diff --git a/...Test/InvalidNamespaceAtEOF_Runtime.ir.txt → ...Test/InvalidNamespaceAtEOF_Runtime.ir.txt b/...Test/InvalidNamespaceAtEOF_Runtime.ir.txt → ...Test/InvalidNamespaceAtEOF_Runtime.ir.txt
diff --git a/...odeGenerationIntegrationTest/Model.cshtml → ...odeGenerationIntegrationTest/Model.cshtml b/...odeGenerationIntegrationTest/Model.cshtml → ...odeGenerationIntegrationTest/Model.cshtml
diff --git a/...ationTest/ModelExpressionTagHelper.cshtml → ...ationTest/ModelExpressionTagHelper.cshtml b/...ationTest/ModelExpressionTagHelper.cshtml → ...ationTest/ModelExpressionTagHelper.cshtml
diff --git a/...ExpressionTagHelper_DesignTime.codegen.cs → ...ExpressionTagHelper_DesignTime.codegen.cs b/...ExpressionTagHelper_DesignTime.codegen.cs → ...ExpressionTagHelper_DesignTime.codegen.cs
diff --git a/...odelExpressionTagHelper_DesignTime.ir.txt → ...odelExpressionTagHelper_DesignTime.ir.txt b/...odelExpressionTagHelper_DesignTime.ir.txt → ...odelExpressionTagHelper_DesignTime.ir.txt
diff --git a/...pressionTagHelper_DesignTime.mappings.txt → ...pressionTagHelper_DesignTime.mappings.txt b/...pressionTagHelper_DesignTime.mappings.txt → ...pressionTagHelper_DesignTime.mappings.txt
diff --git a/...delExpressionTagHelper_Runtime.codegen.cs → ...delExpressionTagHelper_Runtime.codegen.cs b/...delExpressionTagHelper_Runtime.codegen.cs → ...delExpressionTagHelper_Runtime.codegen.cs
diff --git a/...t/ModelExpressionTagHelper_Runtime.ir.txt → ...t/ModelExpressionTagHelper_Runtime.ir.txt b/...t/ModelExpressionTagHelper_Runtime.ir.txt → ...t/ModelExpressionTagHelper_Runtime.ir.txt
diff --git a/...tegrationTest/Model_DesignTime.codegen.cs → ...tegrationTest/Model_DesignTime.codegen.cs b/...tegrationTest/Model_DesignTime.codegen.cs → ...tegrationTest/Model_DesignTime.codegen.cs
diff --git a/...onIntegrationTest/Model_DesignTime.ir.txt → ...onIntegrationTest/Model_DesignTime.ir.txt b/...onIntegrationTest/Model_DesignTime.ir.txt → ...onIntegrationTest/Model_DesignTime.ir.txt
diff --git a/...grationTest/Model_DesignTime.mappings.txt → ...grationTest/Model_DesignTime.mappings.txt b/...grationTest/Model_DesignTime.mappings.txt → ...grationTest/Model_DesignTime.mappings.txt
diff --git a/...nIntegrationTest/Model_Runtime.codegen.cs → ...nIntegrationTest/Model_Runtime.codegen.cs b/...nIntegrationTest/Model_Runtime.codegen.cs → ...nIntegrationTest/Model_Runtime.codegen.cs
diff --git a/...ationIntegrationTest/Model_Runtime.ir.txt → ...ationIntegrationTest/Model_Runtime.ir.txt b/...ationIntegrationTest/Model_Runtime.ir.txt → ...ationIntegrationTest/Model_Runtime.ir.txt
diff --git a/...tionIntegrationTest/MultipleModels.cshtml → ...tionIntegrationTest/MultipleModels.cshtml b/...tionIntegrationTest/MultipleModels.cshtml → ...tionIntegrationTest/MultipleModels.cshtml
diff --git a/...Test/MultipleModels_DesignTime.codegen.cs → ...Test/MultipleModels_DesignTime.codegen.cs b/...Test/MultipleModels_DesignTime.codegen.cs → ...Test/MultipleModels_DesignTime.codegen.cs
diff --git a/...MultipleModels_DesignTime.diagnostics.txt → ...MultipleModels_DesignTime.diagnostics.txt b/...MultipleModels_DesignTime.diagnostics.txt → ...MultipleModels_DesignTime.diagnostics.txt
diff --git a/...tionTest/MultipleModels_DesignTime.ir.txt → ...tionTest/MultipleModels_DesignTime.ir.txt b/...tionTest/MultipleModels_DesignTime.ir.txt → ...tionTest/MultipleModels_DesignTime.ir.txt
diff --git a/...st/MultipleModels_DesignTime.mappings.txt → ...st/MultipleModels_DesignTime.mappings.txt b/...st/MultipleModels_DesignTime.mappings.txt → ...st/MultipleModels_DesignTime.mappings.txt
diff --git a/...GenerationIntegrationTest/Sections.cshtml → ...GenerationIntegrationTest/Sections.cshtml b/...GenerationIntegrationTest/Sections.cshtml → ...GenerationIntegrationTest/Sections.cshtml
diff --git a/...rationTest/Sections_DesignTime.codegen.cs → ...rationTest/Sections_DesignTime.codegen.cs b/...rationTest/Sections_DesignTime.codegen.cs → ...rationTest/Sections_DesignTime.codegen.cs
diff --git a/...ntegrationTest/Sections_DesignTime.ir.txt → ...ntegrationTest/Sections_DesignTime.ir.txt b/...ntegrationTest/Sections_DesignTime.ir.txt → ...ntegrationTest/Sections_DesignTime.ir.txt
diff --git a/...tionTest/Sections_DesignTime.mappings.txt → ...tionTest/Sections_DesignTime.mappings.txt b/...tionTest/Sections_DesignTime.mappings.txt → ...tionTest/Sections_DesignTime.mappings.txt
diff --git a/...grationTest/ViewComponentTagHelper.cshtml → ...grationTest/ViewComponentTagHelper.cshtml b/...grationTest/ViewComponentTagHelper.cshtml → ...grationTest/ViewComponentTagHelper.cshtml
diff --git a/...wComponentTagHelper_DesignTime.codegen.cs → ...wComponentTagHelper_DesignTime.codegen.cs b/...wComponentTagHelper_DesignTime.codegen.cs → ...wComponentTagHelper_DesignTime.codegen.cs
diff --git a/.../ViewComponentTagHelper_DesignTime.ir.txt → .../ViewComponentTagHelper_DesignTime.ir.txt b/.../ViewComponentTagHelper_DesignTime.ir.txt → .../ViewComponentTagHelper_DesignTime.ir.txt
diff --git a/...omponentTagHelper_DesignTime.mappings.txt → ...omponentTagHelper_DesignTime.mappings.txt b/...omponentTagHelper_DesignTime.mappings.txt → ...omponentTagHelper_DesignTime.mappings.txt
diff --git a/...ViewComponentTagHelper_Runtime.codegen.cs → ...ViewComponentTagHelper_Runtime.codegen.cs b/...ViewComponentTagHelper_Runtime.codegen.cs → ...ViewComponentTagHelper_Runtime.codegen.cs
diff --git a/...est/ViewComponentTagHelper_Runtime.ir.txt → ...est/ViewComponentTagHelper_Runtime.ir.txt b/...est/ViewComponentTagHelper_Runtime.ir.txt → ...est/ViewComponentTagHelper_Runtime.ir.txt
diff --git a/...rationIntegrationTest/_ViewImports.cshtml → ...rationIntegrationTest/_ViewImports.cshtml b/...rationIntegrationTest/_ViewImports.cshtml → ...rationIntegrationTest/_ViewImports.cshtml
diff --git a/...onTest/_ViewImports_DesignTime.codegen.cs → ...onTest/_ViewImports_DesignTime.codegen.cs b/...onTest/_ViewImports_DesignTime.codegen.cs → ...onTest/_ViewImports_DesignTime.codegen.cs
diff --git a/...rationTest/_ViewImports_DesignTime.ir.txt → ...rationTest/_ViewImports_DesignTime.ir.txt b/...rationTest/_ViewImports_DesignTime.ir.txt → ...rationTest/_ViewImports_DesignTime.ir.txt
diff --git a/...Test/_ViewImports_DesignTime.mappings.txt → ...Test/_ViewImports_DesignTime.mappings.txt b/...Test/_ViewImports_DesignTime.mappings.txt → ...Test/_ViewImports_DesignTime.mappings.txt
diff --git a/...ationTest/_ViewImports_Runtime.codegen.cs → ...ationTest/_ViewImports_Runtime.codegen.cs b/...ationTest/_ViewImports_Runtime.codegen.cs → ...ationTest/_ViewImports_Runtime.codegen.cs
diff --git a/...tegrationTest/_ViewImports_Runtime.ir.txt → ...tegrationTest/_ViewImports_Runtime.ir.txt b/...tegrationTest/_ViewImports_Runtime.ir.txt → ...tegrationTest/_ViewImports_Runtime.ir.txt
diff --git a/...omponentTagHelperDescriptorFactoryTest.cs → ...omponentTagHelperDescriptorFactoryTest.cs b/...omponentTagHelperDescriptorFactoryTest.cs → ...omponentTagHelperDescriptorFactoryTest.cs
diff --git a/...mponentTagHelperDescriptorProviderTest.cs → ...mponentTagHelperDescriptorProviderTest.cs b/...mponentTagHelperDescriptorProviderTest.cs → ...mponentTagHelperDescriptorProviderTest.cs
diff --git a/..._X.Test/ViewComponentTagHelperPassTest.cs → ..._X/test/ViewComponentTagHelperPassTest.cs b/..._X.Test/ViewComponentTagHelperPassTest.cs → ..._X/test/ViewComponentTagHelperPassTest.cs
diff --git a/...wComponentTagHelperTargetExtensionTest.cs → ...wComponentTagHelperTargetExtensionTest.cs b/...wComponentTagHelperTargetExtensionTest.cs → ...wComponentTagHelperTargetExtensionTest.cs
diff --git a/...n1_X.Test/ViewComponentTypeVisitorTest.cs → ...n1_X/test/ViewComponentTypeVisitorTest.cs b/...n1_X.Test/ViewComponentTypeVisitorTest.cs → ...n1_X/test/ViewComponentTypeVisitorTest.cs
diff --git a/...c.Razor.Extensions.Test/xunit.runner.json → ...ensions.Version1_X/test/xunit.runner.json b/...c.Razor.Extensions.Test/xunit.runner.json → ...ensions.Version1_X/test/xunit.runner.json
diff --git a/...ensions/AssemblyAttributeInjectionPass.cs → ...ons/src/AssemblyAttributeInjectionPass.cs b/...ensions/AssemblyAttributeInjectionPass.cs → ...ons/src/AssemblyAttributeInjectionPass.cs
diff --git a/....Mvc.Razor.Extensions/CSharpIdentifier.cs → ....Razor.Extensions/src/CSharpIdentifier.cs b/....Mvc.Razor.Extensions/CSharpIdentifier.cs → ....Razor.Extensions/src/CSharpIdentifier.cs
diff --git a/....Razor.Extensions/ExtensionInitializer.cs → ...or.Extensions/src/ExtensionInitializer.cs b/....Razor.Extensions/ExtensionInitializer.cs → ...or.Extensions/src/ExtensionInitializer.cs
diff --git a/...azor.Extensions/IInjectTargetExtension.cs → ....Extensions/src/IInjectTargetExtension.cs b/...azor.Extensions/IInjectTargetExtension.cs → ....Extensions/src/IInjectTargetExtension.cs
diff --git a/...IViewComponentTagHelperTargetExtension.cs → ...IViewComponentTagHelperTargetExtension.cs b/...IViewComponentTagHelperTargetExtension.cs → ...IViewComponentTagHelperTargetExtension.cs
diff --git a/...e.Mvc.Razor.Extensions/InjectDirective.cs → ...c.Razor.Extensions/src/InjectDirective.cs b/...e.Mvc.Razor.Extensions/InjectDirective.cs → ...c.Razor.Extensions/src/InjectDirective.cs
diff --git a/...azor.Extensions/InjectIntermediateNode.cs → ....Extensions/src/InjectIntermediateNode.cs b/...azor.Extensions/InjectIntermediateNode.cs → ....Extensions/src/InjectIntermediateNode.cs
diff --git a/...Razor.Extensions/InjectTargetExtension.cs → ...r.Extensions/src/InjectTargetExtension.cs b/...Razor.Extensions/InjectTargetExtension.cs → ...r.Extensions/src/InjectTargetExtension.cs
diff --git a/...c.Razor.Extensions/InstrumentationPass.cs → ...zor.Extensions/src/InstrumentationPass.cs b/...c.Razor.Extensions/InstrumentationPass.cs → ...zor.Extensions/src/InstrumentationPass.cs
diff --git a/...ft.AspNetCore.Mvc.Razor.Extensions.csproj → ...ft.AspNetCore.Mvc.Razor.Extensions.csproj b/...ft.AspNetCore.Mvc.Razor.Extensions.csproj → ...ft.AspNetCore.Mvc.Razor.Extensions.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Microsoft.AspNetCore.Razor.Language\CodeGeneration\CodeWriterExtensions.cs">
+    <Compile Include="..\..\Razor.Language\src\CodeGeneration\CodeWriterExtensions.cs">
       <Link>Shared\CodeWriterExtensions.cs</Link>
     </Compile>
   </ItemGroup>
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj" />
-    <ProjectReference Include="../Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj" />
+    <Reference Include="Microsoft.AspNetCore.Razor.Language" />
+    <Reference Include="Microsoft.CodeAnalysis.Razor" />
   </ItemGroup>
 
 </Project>
diff --git a/...re.Mvc.Razor.Extensions/ModelDirective.cs → ...vc.Razor.Extensions/src/ModelDirective.cs b/...re.Mvc.Razor.Extensions/ModelDirective.cs → ...vc.Razor.Extensions/src/ModelDirective.cs
diff --git a/...c.Razor.Extensions/ModelExpressionPass.cs → ...zor.Extensions/src/ModelExpressionPass.cs b/...c.Razor.Extensions/ModelExpressionPass.cs → ...zor.Extensions/src/ModelExpressionPass.cs
diff --git a/...zor.Extensions/MvcImportProjectFeature.cs → ...Extensions/src/MvcImportProjectFeature.cs b/...zor.Extensions/MvcImportProjectFeature.cs → ...Extensions/src/MvcImportProjectFeature.cs
diff --git a/...azor.Extensions/MvcRazorTemplateEngine.cs → ....Extensions/src/MvcRazorTemplateEngine.cs b/...azor.Extensions/MvcRazorTemplateEngine.cs → ....Extensions/src/MvcRazorTemplateEngine.cs
diff --git a/...tensions/MvcViewDocumentClassifierPass.cs → ...ions/src/MvcViewDocumentClassifierPass.cs b/...tensions/MvcViewDocumentClassifierPass.cs → ...ions/src/MvcViewDocumentClassifierPass.cs
diff --git a/...vc.Razor.Extensions/NamespaceDirective.cs → ...azor.Extensions/src/NamespaceDirective.cs b/...vc.Razor.Extensions/NamespaceDirective.cs → ...azor.Extensions/src/NamespaceDirective.cs
diff --git a/...ore.Mvc.Razor.Extensions/PageDirective.cs → ...Mvc.Razor.Extensions/src/PageDirective.cs b/...ore.Mvc.Razor.Extensions/PageDirective.cs → ...Mvc.Razor.Extensions/src/PageDirective.cs
diff --git a/....Extensions/PagesPropertyInjectionPass.cs → ...ensions/src/PagesPropertyInjectionPass.cs b/....Extensions/PagesPropertyInjectionPass.cs → ...ensions/src/PagesPropertyInjectionPass.cs
diff --git a/...zor.Extensions/Properties/AssemblyInfo.cs → ...Extensions/src/Properties/AssemblyInfo.cs b/...zor.Extensions/Properties/AssemblyInfo.cs → ...Extensions/src/Properties/AssemblyInfo.cs
diff --git a/...tensions/Properties/Resources.Designer.cs → ...ions/src/Properties/Resources.Designer.cs b/...tensions/Properties/Resources.Designer.cs → ...ions/src/Properties/Resources.Designer.cs
diff --git a/...erties/ViewComponentResources.Designer.cs → ...erties/ViewComponentResources.Designer.cs b/...erties/ViewComponentResources.Designer.cs → ...erties/ViewComponentResources.Designer.cs
diff --git a/...e.Mvc.Razor.Extensions/RazorExtensions.cs → ...c.Razor.Extensions/src/RazorExtensions.cs b/...e.Mvc.Razor.Extensions/RazorExtensions.cs → ...c.Razor.Extensions/src/RazorExtensions.cs
diff --git a/...sions/RazorExtensionsDiagnosticFactory.cs → ...s/src/RazorExtensionsDiagnosticFactory.cs b/...sions/RazorExtensionsDiagnosticFactory.cs → ...s/src/RazorExtensionsDiagnosticFactory.cs
diff --git a/...nsions/RazorPageDocumentClassifierPass.cs → ...ns/src/RazorPageDocumentClassifierPass.cs b/...nsions/RazorPageDocumentClassifierPass.cs → ...ns/src/RazorPageDocumentClassifierPass.cs
diff --git a/...tCore.Mvc.Razor.Extensions/Resources.resx → src/Mvc.Razor.Extensions/src/Resources.resx b/...tCore.Mvc.Razor.Extensions/Resources.resx → src/Mvc.Razor.Extensions/src/Resources.resx
diff --git a/...tensions/TagHelperDescriptorExtensions.cs → ...ions/src/TagHelperDescriptorExtensions.cs b/...tensions/TagHelperDescriptorExtensions.cs → ...ions/src/TagHelperDescriptorExtensions.cs
diff --git a/...or.Extensions/ViewComponentResources.resx → ...xtensions/src/ViewComponentResources.resx b/...or.Extensions/ViewComponentResources.resx → ...xtensions/src/ViewComponentResources.resx
diff --git a/...ions/ViewComponentTagHelperConventions.cs → .../src/ViewComponentTagHelperConventions.cs b/...ions/ViewComponentTagHelperConventions.cs → .../src/ViewComponentTagHelperConventions.cs
diff --git a/...iewComponentTagHelperDescriptorFactory.cs → ...iewComponentTagHelperDescriptorFactory.cs b/...iewComponentTagHelperDescriptorFactory.cs → ...iewComponentTagHelperDescriptorFactory.cs
diff --git a/...ewComponentTagHelperDescriptorProvider.cs → ...ewComponentTagHelperDescriptorProvider.cs b/...ewComponentTagHelperDescriptorProvider.cs → ...ewComponentTagHelperDescriptorProvider.cs
diff --git a/...ViewComponentTagHelperIntermediateNode.cs → ...ViewComponentTagHelperIntermediateNode.cs b/...ViewComponentTagHelperIntermediateNode.cs → ...ViewComponentTagHelperIntermediateNode.cs
diff --git a/...ensions/ViewComponentTagHelperMetadata.cs → ...ons/src/ViewComponentTagHelperMetadata.cs b/...ensions/ViewComponentTagHelperMetadata.cs → ...ons/src/ViewComponentTagHelperMetadata.cs
diff --git a/....Extensions/ViewComponentTagHelperPass.cs → ...ensions/src/ViewComponentTagHelperPass.cs b/....Extensions/ViewComponentTagHelperPass.cs → ...ensions/src/ViewComponentTagHelperPass.cs
diff --git a/.../ViewComponentTagHelperTargetExtension.cs → .../ViewComponentTagHelperTargetExtension.cs b/.../ViewComponentTagHelperTargetExtension.cs → .../ViewComponentTagHelperTargetExtension.cs
diff --git a/...or.Extensions/ViewComponentTypeVisitor.cs → ...xtensions/src/ViewComponentTypeVisitor.cs b/...or.Extensions/ViewComponentTypeVisitor.cs → ...xtensions/src/ViewComponentTypeVisitor.cs
diff --git a/...vc.Razor.Extensions/ViewComponentTypes.cs → ...azor.Extensions/src/ViewComponentTypes.cs b/...vc.Razor.Extensions/ViewComponentTypes.cs → ...azor.Extensions/src/ViewComponentTypes.cs
diff --git a/...vc.Razor.Extensions/baseline.netcore.json → ...azor.Extensions/src/baseline.netcore.json b/...vc.Razor.Extensions/baseline.netcore.json → ...azor.Extensions/src/baseline.netcore.json
diff --git a/...zor.Extensions/baseline.netframework.json → ...Extensions/src/baseline.netframework.json b/...zor.Extensions/baseline.netframework.json → ...Extensions/src/baseline.netframework.json
diff --git a/...oft.AspNetCore.Mvc.Razor.Extensions.props → ...oft.AspNetCore.Mvc.Razor.Extensions.props b/...oft.AspNetCore.Mvc.Razor.Extensions.props → ...oft.AspNetCore.Mvc.Razor.Extensions.props
diff --git a/...t.AspNetCore.Mvc.Razor.Extensions.targets → ...t.AspNetCore.Mvc.Razor.Extensions.targets b/...t.AspNetCore.Mvc.Razor.Extensions.targets → ...t.AspNetCore.Mvc.Razor.Extensions.targets
diff --git a/...est/AssemblyAttributeInjectionPassTest.cs → ...est/AssemblyAttributeInjectionPassTest.cs b/...est/AssemblyAttributeInjectionPassTest.cs → ...est/AssemblyAttributeInjectionPassTest.cs
diff --git a/...or.Extensions.Test/InjectDirectiveTest.cs → ...or.Extensions/test/InjectDirectiveTest.cs b/...or.Extensions.Test/InjectDirectiveTest.cs → ...or.Extensions/test/InjectDirectiveTest.cs
diff --git a/...ensions.Test/InjectTargetExtensionTest.cs → ...ensions/test/InjectTargetExtensionTest.cs b/...ensions.Test/InjectTargetExtensionTest.cs → ...ensions/test/InjectTargetExtensionTest.cs
diff --git a/...xtensions.Test/InstrumentationPassTest.cs → ...xtensions/test/InstrumentationPassTest.cs b/...xtensions.Test/InstrumentationPassTest.cs → ...xtensions/test/InstrumentationPassTest.cs
diff --git a/...ionTests/CodeGenerationIntegrationTest.cs → ...ionTests/CodeGenerationIntegrationTest.cs b/...ionTests/CodeGenerationIntegrationTest.cs → ...ionTests/CodeGenerationIntegrationTest.cs
diff --git a/...sts/InstrumentationPassIntegrationTest.cs → ...sts/InstrumentationPassIntegrationTest.cs b/...sts/InstrumentationPassIntegrationTest.cs → ...sts/InstrumentationPassIntegrationTest.cs
diff --git a/src/Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/src/Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
@@ -0,0 +1,38 @@
+<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>
+    <Reference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" />
+    <Reference Include="Microsoft.AspNetCore.Razor.Test.Common" />
+    <Reference Include="Microsoft.AspNetCore.Razor.Runtime" />
+    <Reference Include="Microsoft.CodeAnalysis.Razor" />
+    <Reference Include="Microsoft.CodeAnalysis.CSharp" />
+    <Reference Include="Microsoft.Extensions.DependencyModel" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- We need this to compile but don't want it referenced by the project. It is included dynamically in CodeGeneration tests. -->
+    <Reference Include="Microsoft.AspNetCore.Razor.Test.MvcShim" />
+
+    <!-- Due to how DependencyContext.Load handles our special MvcShim reference above we need to also reference the MvcShim's DiagnosticSource dependency -->
+    <Reference Include="System.Diagnostics.DiagnosticSource" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <MvcShim Condition="$(TargetFramework) != ''" Include="..\..\test\testassets\Razor.Test.MvcShim\bin\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.deps.json" />
+  </ItemGroup>
+
+  <Target Name="CopyDepsFromShims" AfterTargets="Build">
+    <Copy SourceFiles="@(MvcShim)" DestinationFolder="$(OutputPath)" />
+  </Target>
+</Project>
diff --git a/...zor.Extensions.Test/ModelDirectiveTest.cs → ...zor.Extensions/test/ModelDirectiveTest.cs b/...zor.Extensions.Test/ModelDirectiveTest.cs → ...zor.Extensions/test/ModelDirectiveTest.cs
diff --git a/...xtensions.Test/ModelExpressionPassTest.cs → ...xtensions/test/ModelExpressionPassTest.cs b/...xtensions.Test/ModelExpressionPassTest.cs → ...xtensions/test/ModelExpressionPassTest.cs
diff --git a/...sions.Test/MvcImportProjectFeatureTest.cs → ...sions/test/MvcImportProjectFeatureTest.cs b/...sions.Test/MvcImportProjectFeatureTest.cs → ...sions/test/MvcImportProjectFeatureTest.cs
diff --git a/...nsions.Test/MvcRazorTemplateEngineTest.cs → ...nsions/test/MvcRazorTemplateEngineTest.cs b/...nsions.Test/MvcRazorTemplateEngineTest.cs → ...nsions/test/MvcRazorTemplateEngineTest.cs
diff --git a/...Core.Mvc.Razor.Extensions.Test/MvcShim.cs → src/Mvc.Razor.Extensions/test/MvcShim.cs b/...Core.Mvc.Razor.Extensions.Test/MvcShim.cs → src/Mvc.Razor.Extensions/test/MvcShim.cs
diff --git a/...Test/MvcViewDocumentClassifierPassTest.cs → ...test/MvcViewDocumentClassifierPassTest.cs b/...Test/MvcViewDocumentClassifierPassTest.cs → ...test/MvcViewDocumentClassifierPassTest.cs
diff --git a/...Extensions.Test/NamespaceDirectiveTest.cs → ...Extensions/test/NamespaceDirectiveTest.cs b/...Extensions.Test/NamespaceDirectiveTest.cs → ...Extensions/test/NamespaceDirectiveTest.cs
diff --git a/...azor.Extensions.Test/PageDirectiveTest.cs → ...azor.Extensions/test/PageDirectiveTest.cs b/...azor.Extensions.Test/PageDirectiveTest.cs → ...azor.Extensions/test/PageDirectiveTest.cs
diff --git a/...ersion1_X.Test/Properties/AssemblyInfo.cs → ...xtensions/test/Properties/AssemblyInfo.cs b/...ersion1_X.Test/Properties/AssemblyInfo.cs → ...xtensions/test/Properties/AssemblyInfo.cs
diff --git a/...st/RazorPageDocumentClassifierPassTest.cs → ...st/RazorPageDocumentClassifierPassTest.cs b/...st/RazorPageDocumentClassifierPassTest.cs → ...st/RazorPageDocumentClassifierPassTest.cs
diff --git a/...tensions.Test/SourceMappingsSerializer.cs → ...tensions/test/SourceMappingsSerializer.cs b/...tensions.Test/SourceMappingsSerializer.cs → ...tensions/test/SourceMappingsSerializer.cs
diff --git a/...Test/TagHelperDescriptorExtensionsTest.cs → ...test/TagHelperDescriptorExtensionsTest.cs b/...Test/TagHelperDescriptorExtensionsTest.cs → ...test/TagHelperDescriptorExtensionsTest.cs
diff --git a/...odeGenerationIntegrationTest/Basic.cshtml → ...odeGenerationIntegrationTest/Basic.cshtml b/...odeGenerationIntegrationTest/Basic.cshtml → ...odeGenerationIntegrationTest/Basic.cshtml
diff --git a/...tegrationTest/Basic_DesignTime.codegen.cs → ...tegrationTest/Basic_DesignTime.codegen.cs b/...tegrationTest/Basic_DesignTime.codegen.cs → ...tegrationTest/Basic_DesignTime.codegen.cs
diff --git a/...onIntegrationTest/Basic_DesignTime.ir.txt → ...onIntegrationTest/Basic_DesignTime.ir.txt b/...onIntegrationTest/Basic_DesignTime.ir.txt → ...onIntegrationTest/Basic_DesignTime.ir.txt
diff --git a/...grationTest/Basic_DesignTime.mappings.txt → ...grationTest/Basic_DesignTime.mappings.txt b/...grationTest/Basic_DesignTime.mappings.txt → ...grationTest/Basic_DesignTime.mappings.txt
diff --git a/...nIntegrationTest/Basic_Runtime.codegen.cs → ...nIntegrationTest/Basic_Runtime.codegen.cs b/...nIntegrationTest/Basic_Runtime.codegen.cs → ...nIntegrationTest/Basic_Runtime.codegen.cs
diff --git a/...ationIntegrationTest/Basic_Runtime.ir.txt → ...ationIntegrationTest/Basic_Runtime.ir.txt b/...ationIntegrationTest/Basic_Runtime.ir.txt → ...ationIntegrationTest/Basic_Runtime.ir.txt
diff --git a/...tegrationTest/IncompleteDirectives.cshtml → ...tegrationTest/IncompleteDirectives.cshtml b/...tegrationTest/IncompleteDirectives.cshtml → ...tegrationTest/IncompleteDirectives.cshtml
diff --git a/...ncompleteDirectives_DesignTime.codegen.cs → ...ncompleteDirectives_DesignTime.codegen.cs b/...ncompleteDirectives_DesignTime.codegen.cs → ...ncompleteDirectives_DesignTime.codegen.cs
diff --git a/...leteDirectives_DesignTime.diagnostics.txt → ...leteDirectives_DesignTime.diagnostics.txt b/...leteDirectives_DesignTime.diagnostics.txt → ...leteDirectives_DesignTime.diagnostics.txt
diff --git a/...st/IncompleteDirectives_DesignTime.ir.txt → ...st/IncompleteDirectives_DesignTime.ir.txt b/...st/IncompleteDirectives_DesignTime.ir.txt → ...st/IncompleteDirectives_DesignTime.ir.txt
diff --git a/...ompleteDirectives_DesignTime.mappings.txt → ...ompleteDirectives_DesignTime.mappings.txt b/...ompleteDirectives_DesignTime.mappings.txt → ...ompleteDirectives_DesignTime.mappings.txt
diff --git a/...t/IncompleteDirectives_Runtime.codegen.cs → ...t/IncompleteDirectives_Runtime.codegen.cs b/...t/IncompleteDirectives_Runtime.codegen.cs → ...t/IncompleteDirectives_Runtime.codegen.cs
diff --git a/...ompleteDirectives_Runtime.diagnostics.txt → ...ompleteDirectives_Runtime.diagnostics.txt b/...ompleteDirectives_Runtime.diagnostics.txt → ...ompleteDirectives_Runtime.diagnostics.txt
diff --git a/...nTest/IncompleteDirectives_Runtime.ir.txt → ...nTest/IncompleteDirectives_Runtime.ir.txt b/...nTest/IncompleteDirectives_Runtime.ir.txt → ...nTest/IncompleteDirectives_Runtime.ir.txt
diff --git a/...nIntegrationTest/InheritsViewModel.cshtml → ...nIntegrationTest/InheritsViewModel.cshtml b/...nIntegrationTest/InheritsViewModel.cshtml → ...nIntegrationTest/InheritsViewModel.cshtml
diff --git a/...t/InheritsViewModel_DesignTime.codegen.cs → ...t/InheritsViewModel_DesignTime.codegen.cs b/...t/InheritsViewModel_DesignTime.codegen.cs → ...t/InheritsViewModel_DesignTime.codegen.cs
diff --git a/...nTest/InheritsViewModel_DesignTime.ir.txt → ...nTest/InheritsViewModel_DesignTime.ir.txt b/...nTest/InheritsViewModel_DesignTime.ir.txt → ...nTest/InheritsViewModel_DesignTime.ir.txt
diff --git a/...InheritsViewModel_DesignTime.mappings.txt → ...InheritsViewModel_DesignTime.mappings.txt b/...InheritsViewModel_DesignTime.mappings.txt → ...InheritsViewModel_DesignTime.mappings.txt
diff --git a/...Test/InheritsViewModel_Runtime.codegen.cs → ...Test/InheritsViewModel_Runtime.codegen.cs b/...Test/InheritsViewModel_Runtime.codegen.cs → ...Test/InheritsViewModel_Runtime.codegen.cs
diff --git a/...tionTest/InheritsViewModel_Runtime.ir.txt → ...tionTest/InheritsViewModel_Runtime.ir.txt b/...tionTest/InheritsViewModel_Runtime.ir.txt → ...tionTest/InheritsViewModel_Runtime.ir.txt
diff --git a/...rationTest/InheritsWithViewImports.cshtml → ...rationTest/InheritsWithViewImports.cshtml b/...rationTest/InheritsWithViewImports.cshtml → ...rationTest/InheritsWithViewImports.cshtml
diff --git a/...ritsWithViewImports_DesignTime.codegen.cs → ...ritsWithViewImports_DesignTime.codegen.cs b/...ritsWithViewImports_DesignTime.codegen.cs → ...ritsWithViewImports_DesignTime.codegen.cs
diff --git a/...InheritsWithViewImports_DesignTime.ir.txt → ...InheritsWithViewImports_DesignTime.ir.txt b/...InheritsWithViewImports_DesignTime.ir.txt → ...InheritsWithViewImports_DesignTime.ir.txt
diff --git a/...tsWithViewImports_DesignTime.mappings.txt → ...tsWithViewImports_DesignTime.mappings.txt b/...tsWithViewImports_DesignTime.mappings.txt → ...tsWithViewImports_DesignTime.mappings.txt
diff --git a/...t/InheritsWithViewImports_Imports0.cshtml → ...t/InheritsWithViewImports_Imports0.cshtml b/...t/InheritsWithViewImports_Imports0.cshtml → ...t/InheritsWithViewImports_Imports0.cshtml
diff --git a/...nheritsWithViewImports_Runtime.codegen.cs → ...nheritsWithViewImports_Runtime.codegen.cs b/...nheritsWithViewImports_Runtime.codegen.cs → ...nheritsWithViewImports_Runtime.codegen.cs
diff --git a/...st/InheritsWithViewImports_Runtime.ir.txt → ...st/InheritsWithViewImports_Runtime.ir.txt b/...st/InheritsWithViewImports_Runtime.ir.txt → ...st/InheritsWithViewImports_Runtime.ir.txt
diff --git a/...deGenerationIntegrationTest/Inject.cshtml → ...deGenerationIntegrationTest/Inject.cshtml b/...deGenerationIntegrationTest/Inject.cshtml → ...deGenerationIntegrationTest/Inject.cshtml
diff --git a/...ionIntegrationTest/InjectWithModel.cshtml → ...ionIntegrationTest/InjectWithModel.cshtml b/...ionIntegrationTest/InjectWithModel.cshtml → ...ionIntegrationTest/InjectWithModel.cshtml
diff --git a/...est/InjectWithModel_DesignTime.codegen.cs → ...est/InjectWithModel_DesignTime.codegen.cs b/...est/InjectWithModel_DesignTime.codegen.cs → ...est/InjectWithModel_DesignTime.codegen.cs
diff --git a/...ionTest/InjectWithModel_DesignTime.ir.txt → ...ionTest/InjectWithModel_DesignTime.ir.txt b/...ionTest/InjectWithModel_DesignTime.ir.txt → ...ionTest/InjectWithModel_DesignTime.ir.txt
diff --git a/...t/InjectWithModel_DesignTime.mappings.txt → ...t/InjectWithModel_DesignTime.mappings.txt b/...t/InjectWithModel_DesignTime.mappings.txt → ...t/InjectWithModel_DesignTime.mappings.txt
diff --git a/...onTest/InjectWithModel_Runtime.codegen.cs → ...onTest/InjectWithModel_Runtime.codegen.cs b/...onTest/InjectWithModel_Runtime.codegen.cs → ...onTest/InjectWithModel_Runtime.codegen.cs
diff --git a/...rationTest/InjectWithModel_Runtime.ir.txt → ...rationTest/InjectWithModel_Runtime.ir.txt b/...rationTest/InjectWithModel_Runtime.ir.txt → ...rationTest/InjectWithModel_Runtime.ir.txt
diff --git a/...ntegrationTest/InjectWithSemicolon.cshtml → ...ntegrationTest/InjectWithSemicolon.cshtml b/...ntegrationTest/InjectWithSemicolon.cshtml → ...ntegrationTest/InjectWithSemicolon.cshtml
diff --git a/...InjectWithSemicolon_DesignTime.codegen.cs → ...InjectWithSemicolon_DesignTime.codegen.cs b/...InjectWithSemicolon_DesignTime.codegen.cs → ...InjectWithSemicolon_DesignTime.codegen.cs
diff --git a/...est/InjectWithSemicolon_DesignTime.ir.txt → ...est/InjectWithSemicolon_DesignTime.ir.txt b/...est/InjectWithSemicolon_DesignTime.ir.txt → ...est/InjectWithSemicolon_DesignTime.ir.txt
diff --git a/...jectWithSemicolon_DesignTime.mappings.txt → ...jectWithSemicolon_DesignTime.mappings.txt b/...jectWithSemicolon_DesignTime.mappings.txt → ...jectWithSemicolon_DesignTime.mappings.txt
diff --git a/...st/InjectWithSemicolon_Runtime.codegen.cs → ...st/InjectWithSemicolon_Runtime.codegen.cs b/...st/InjectWithSemicolon_Runtime.codegen.cs → ...st/InjectWithSemicolon_Runtime.codegen.cs
diff --git a/...onTest/InjectWithSemicolon_Runtime.ir.txt → ...onTest/InjectWithSemicolon_Runtime.ir.txt b/...onTest/InjectWithSemicolon_Runtime.ir.txt → ...onTest/InjectWithSemicolon_Runtime.ir.txt
diff --git a/...egrationTest/Inject_DesignTime.codegen.cs → ...egrationTest/Inject_DesignTime.codegen.cs b/...egrationTest/Inject_DesignTime.codegen.cs → ...egrationTest/Inject_DesignTime.codegen.cs
diff --git a/...nIntegrationTest/Inject_DesignTime.ir.txt → ...nIntegrationTest/Inject_DesignTime.ir.txt b/...nIntegrationTest/Inject_DesignTime.ir.txt → ...nIntegrationTest/Inject_DesignTime.ir.txt
diff --git a/...rationTest/Inject_DesignTime.mappings.txt → ...rationTest/Inject_DesignTime.mappings.txt b/...rationTest/Inject_DesignTime.mappings.txt → ...rationTest/Inject_DesignTime.mappings.txt
diff --git a/...IntegrationTest/Inject_Runtime.codegen.cs → ...IntegrationTest/Inject_Runtime.codegen.cs b/...IntegrationTest/Inject_Runtime.codegen.cs → ...IntegrationTest/Inject_Runtime.codegen.cs
diff --git a/...tionIntegrationTest/Inject_Runtime.ir.txt → ...tionIntegrationTest/Inject_Runtime.ir.txt b/...tionIntegrationTest/Inject_Runtime.ir.txt → ...tionIntegrationTest/Inject_Runtime.ir.txt
diff --git a/...egrationTest/InvalidNamespaceAtEOF.cshtml → ...egrationTest/InvalidNamespaceAtEOF.cshtml b/...egrationTest/InvalidNamespaceAtEOF.cshtml → ...egrationTest/InvalidNamespaceAtEOF.cshtml
diff --git a/...validNamespaceAtEOF_DesignTime.codegen.cs → ...validNamespaceAtEOF_DesignTime.codegen.cs b/...validNamespaceAtEOF_DesignTime.codegen.cs → ...validNamespaceAtEOF_DesignTime.codegen.cs
diff --git a/...NamespaceAtEOF_DesignTime.diagnostics.txt → ...NamespaceAtEOF_DesignTime.diagnostics.txt b/...NamespaceAtEOF_DesignTime.diagnostics.txt → ...NamespaceAtEOF_DesignTime.diagnostics.txt
diff --git a/...t/InvalidNamespaceAtEOF_DesignTime.ir.txt → ...t/InvalidNamespaceAtEOF_DesignTime.ir.txt b/...t/InvalidNamespaceAtEOF_DesignTime.ir.txt → ...t/InvalidNamespaceAtEOF_DesignTime.ir.txt
diff --git a/...lidNamespaceAtEOF_DesignTime.mappings.txt → ...lidNamespaceAtEOF_DesignTime.mappings.txt b/...lidNamespaceAtEOF_DesignTime.mappings.txt → ...lidNamespaceAtEOF_DesignTime.mappings.txt
diff --git a/.../InvalidNamespaceAtEOF_Runtime.codegen.cs → .../InvalidNamespaceAtEOF_Runtime.codegen.cs b/.../InvalidNamespaceAtEOF_Runtime.codegen.cs → .../InvalidNamespaceAtEOF_Runtime.codegen.cs
diff --git a/...lidNamespaceAtEOF_Runtime.diagnostics.txt → ...lidNamespaceAtEOF_Runtime.diagnostics.txt b/...lidNamespaceAtEOF_Runtime.diagnostics.txt → ...lidNamespaceAtEOF_Runtime.diagnostics.txt
diff --git a/...Test/InvalidNamespaceAtEOF_Runtime.ir.txt → ...Test/InvalidNamespaceAtEOF_Runtime.ir.txt b/...Test/InvalidNamespaceAtEOF_Runtime.ir.txt → ...Test/InvalidNamespaceAtEOF_Runtime.ir.txt
diff --git a/...grationTest/MalformedPageDirective.cshtml → ...grationTest/MalformedPageDirective.cshtml b/...grationTest/MalformedPageDirective.cshtml → ...grationTest/MalformedPageDirective.cshtml
diff --git a/...formedPageDirective_DesignTime.codegen.cs → ...formedPageDirective_DesignTime.codegen.cs b/...formedPageDirective_DesignTime.codegen.cs → ...formedPageDirective_DesignTime.codegen.cs
diff --git a/...dPageDirective_DesignTime.diagnostics.txt → ...dPageDirective_DesignTime.diagnostics.txt b/...dPageDirective_DesignTime.diagnostics.txt → ...dPageDirective_DesignTime.diagnostics.txt
diff --git a/.../MalformedPageDirective_DesignTime.ir.txt → .../MalformedPageDirective_DesignTime.ir.txt b/.../MalformedPageDirective_DesignTime.ir.txt → .../MalformedPageDirective_DesignTime.ir.txt
diff --git a/...rmedPageDirective_DesignTime.mappings.txt → ...rmedPageDirective_DesignTime.mappings.txt b/...rmedPageDirective_DesignTime.mappings.txt → ...rmedPageDirective_DesignTime.mappings.txt
diff --git a/...MalformedPageDirective_Runtime.codegen.cs → ...MalformedPageDirective_Runtime.codegen.cs b/...MalformedPageDirective_Runtime.codegen.cs → ...MalformedPageDirective_Runtime.codegen.cs
diff --git a/...rmedPageDirective_Runtime.diagnostics.txt → ...rmedPageDirective_Runtime.diagnostics.txt b/...rmedPageDirective_Runtime.diagnostics.txt → ...rmedPageDirective_Runtime.diagnostics.txt
diff --git a/...est/MalformedPageDirective_Runtime.ir.txt → ...est/MalformedPageDirective_Runtime.ir.txt b/...est/MalformedPageDirective_Runtime.ir.txt → ...est/MalformedPageDirective_Runtime.ir.txt
diff --git a/...odeGenerationIntegrationTest/Model.cshtml → ...odeGenerationIntegrationTest/Model.cshtml b/...odeGenerationIntegrationTest/Model.cshtml → ...odeGenerationIntegrationTest/Model.cshtml
diff --git a/...ationTest/ModelExpressionTagHelper.cshtml → ...ationTest/ModelExpressionTagHelper.cshtml b/...ationTest/ModelExpressionTagHelper.cshtml → ...ationTest/ModelExpressionTagHelper.cshtml
diff --git a/...ExpressionTagHelper_DesignTime.codegen.cs → ...ExpressionTagHelper_DesignTime.codegen.cs b/...ExpressionTagHelper_DesignTime.codegen.cs → ...ExpressionTagHelper_DesignTime.codegen.cs
diff --git a/...odelExpressionTagHelper_DesignTime.ir.txt → ...odelExpressionTagHelper_DesignTime.ir.txt b/...odelExpressionTagHelper_DesignTime.ir.txt → ...odelExpressionTagHelper_DesignTime.ir.txt
diff --git a/...pressionTagHelper_DesignTime.mappings.txt → ...pressionTagHelper_DesignTime.mappings.txt b/...pressionTagHelper_DesignTime.mappings.txt → ...pressionTagHelper_DesignTime.mappings.txt
diff --git a/...delExpressionTagHelper_Runtime.codegen.cs → ...delExpressionTagHelper_Runtime.codegen.cs b/...delExpressionTagHelper_Runtime.codegen.cs → ...delExpressionTagHelper_Runtime.codegen.cs
diff --git a/...t/ModelExpressionTagHelper_Runtime.ir.txt → ...t/ModelExpressionTagHelper_Runtime.ir.txt b/...t/ModelExpressionTagHelper_Runtime.ir.txt → ...t/ModelExpressionTagHelper_Runtime.ir.txt
diff --git a/...tegrationTest/Model_DesignTime.codegen.cs → ...tegrationTest/Model_DesignTime.codegen.cs b/...tegrationTest/Model_DesignTime.codegen.cs → ...tegrationTest/Model_DesignTime.codegen.cs
diff --git a/...onIntegrationTest/Model_DesignTime.ir.txt → ...onIntegrationTest/Model_DesignTime.ir.txt b/...onIntegrationTest/Model_DesignTime.ir.txt → ...onIntegrationTest/Model_DesignTime.ir.txt
diff --git a/...grationTest/Model_DesignTime.mappings.txt → ...grationTest/Model_DesignTime.mappings.txt b/...grationTest/Model_DesignTime.mappings.txt → ...grationTest/Model_DesignTime.mappings.txt
diff --git a/...nIntegrationTest/Model_Runtime.codegen.cs → ...nIntegrationTest/Model_Runtime.codegen.cs b/...nIntegrationTest/Model_Runtime.codegen.cs → ...nIntegrationTest/Model_Runtime.codegen.cs
diff --git a/...ationIntegrationTest/Model_Runtime.ir.txt → ...ationIntegrationTest/Model_Runtime.ir.txt b/...ationIntegrationTest/Model_Runtime.ir.txt → ...ationIntegrationTest/Model_Runtime.ir.txt
diff --git a/...tionIntegrationTest/MultipleModels.cshtml → ...tionIntegrationTest/MultipleModels.cshtml b/...tionIntegrationTest/MultipleModels.cshtml → ...tionIntegrationTest/MultipleModels.cshtml