diff --git a/Directory.Build.targets b/Directory.Build.targets index 32ea0d559037..bd768a49b0fb 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,6 +1,6 @@ - + $(AssemblyName) false @@ -52,5 +52,6 @@ + diff --git a/build/artifacts.props b/build/artifacts.props index 5d5e60ee42ba..23168418a404 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -114,7 +114,6 @@ - @@ -182,7 +181,6 @@ - diff --git a/build/buildorder.props b/build/buildorder.props index 2899757373c0..ec15a752e576 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -7,7 +7,6 @@ - diff --git a/build/repo.props b/build/repo.props index 0f267468e75f..c093551d2b09 100644 --- a/build/repo.props +++ b/build/repo.props @@ -61,7 +61,8 @@ @@ -79,6 +80,7 @@ $(RepositoryRoot)src\Shared\**\*.*proj; $(RepositoryRoot)src\Tools\**\*.*proj; $(RepositoryRoot)src\Middleware\**\*.*proj; + $(RepositoryRoot)src\Razor\**\*.*proj; " Exclude=" @(ProjectToExclude); diff --git a/build/submodules.props b/build/submodules.props index 3521bb4a9287..c96fb1b2e149 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -54,7 +54,6 @@ - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index f4feda3691f9..4ea2a77ec191 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -459,6 +459,18 @@ + + + 2.1.2 + + + + + + + + + 2.1.1 @@ -466,6 +478,32 @@ + + + 2.1.2 + + + + + + + 2.1.2 + + + + + 2.1.2 + + + + + + 2.1.2 + + + + + 2.1.1 @@ -689,6 +727,21 @@ + + + 2.1.2 + + + + + + + + + + + + 2.1.1 @@ -705,4 +758,9 @@ + + + 2.1.2 + + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 1abf801fc9c4..85f08dbe5eda 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -56,7 +56,12 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + + + + + @@ -76,6 +81,8 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 80c3757705ef..ac07dce98c2d 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -26,6 +26,10 @@ and are generated based on the last package release. + + + + @@ -40,6 +44,7 @@ and are generated based on the last package release. + @@ -62,6 +67,7 @@ and are generated based on the last package release. + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 944909a34b34..c72b620aa16e 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -80,5 +80,20 @@ + + + + + + + + + + + + + + + diff --git a/eng/targets/FSharp.Common.targets b/eng/targets/FSharp.Common.targets new file mode 100644 index 000000000000..d631e77830ff --- /dev/null +++ b/eng/targets/FSharp.Common.targets @@ -0,0 +1,4 @@ + + + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj index 88f06a4cbb19..fbafa2be5f60 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj @@ -8,6 +8,7 @@ + @@ -16,7 +17,6 @@ - diff --git a/src/Razor/.gitignore b/src/Razor/.gitignore deleted file mode 100644 index a0265568eb1b..000000000000 --- a/src/Razor/.gitignore +++ /dev/null @@ -1,40 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -.build/ -.testPublish/ -*.sln.ide/ -_ReSharper.*/ -packages/ -artifacts/ -.build/ -PublishProfiles/ -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -project.lock.json -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -.build/ -.vs/ -launchSettings.json -global.json -.vscode/* -BenchmarkDotNet.Artifacts/ -Microsoft.VisualStudio.RazorExtension.nuget.props -Microsoft.VisualStudio.RazorExtension.nuget.targets -msbuild.binlog -msbuild.log diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/AssemblyIdentityEqualityComparer.cs b/src/Razor/CodeAnalysis.Razor/src/AssemblyIdentityEqualityComparer.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/AssemblyIdentityEqualityComparer.cs rename to src/Razor/CodeAnalysis.Razor/src/AssemblyIdentityEqualityComparer.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/CompilationTagHelperFeature.cs b/src/Razor/CodeAnalysis.Razor/src/CompilationTagHelperFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/CompilationTagHelperFeature.cs rename to src/Razor/CodeAnalysis.Razor/src/CompilationTagHelperFeature.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/DefaultMetadataReferenceFeature.cs b/src/Razor/CodeAnalysis.Razor/src/DefaultMetadataReferenceFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/DefaultMetadataReferenceFeature.cs rename to src/Razor/CodeAnalysis.Razor/src/DefaultMetadataReferenceFeature.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/DefaultTagHelperDescriptorFactory.cs b/src/Razor/CodeAnalysis.Razor/src/DefaultTagHelperDescriptorFactory.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/DefaultTagHelperDescriptorFactory.cs rename to src/Razor/CodeAnalysis.Razor/src/DefaultTagHelperDescriptorFactory.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/DefaultTagHelperDescriptorProvider.cs b/src/Razor/CodeAnalysis.Razor/src/DefaultTagHelperDescriptorProvider.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/DefaultTagHelperDescriptorProvider.cs rename to src/Razor/CodeAnalysis.Razor/src/DefaultTagHelperDescriptorProvider.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/FilePathComparer.cs b/src/Razor/CodeAnalysis.Razor/src/FilePathComparer.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/FilePathComparer.cs rename to src/Razor/CodeAnalysis.Razor/src/FilePathComparer.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/IMetadataReferenceFeature.cs b/src/Razor/CodeAnalysis.Razor/src/IMetadataReferenceFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/IMetadataReferenceFeature.cs rename to src/Razor/CodeAnalysis.Razor/src/IMetadataReferenceFeature.cs diff --git a/src/Razor/CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj b/src/Razor/CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj new file mode 100644 index 000000000000..b35fcc3c52da --- /dev/null +++ b/src/Razor/CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj @@ -0,0 +1,21 @@ + + + + Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure. + net46;netstandard2.0 + + + + + + + + + + + + + + + + diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/Properties/AssemblyInfo.cs b/src/Razor/CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/Properties/AssemblyInfo.cs rename to src/Razor/CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/Properties/Resources.Designer.cs b/src/Razor/CodeAnalysis.Razor/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/Properties/Resources.Designer.cs rename to src/Razor/CodeAnalysis.Razor/src/Properties/Resources.Designer.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/RazorDiagnosticFactory.cs b/src/Razor/CodeAnalysis.Razor/src/RazorDiagnosticFactory.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/RazorDiagnosticFactory.cs rename to src/Razor/CodeAnalysis.Razor/src/RazorDiagnosticFactory.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/RazorLanguage.cs b/src/Razor/CodeAnalysis.Razor/src/RazorLanguage.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/RazorLanguage.cs rename to src/Razor/CodeAnalysis.Razor/src/RazorLanguage.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/RequiredAttributeParser.cs b/src/Razor/CodeAnalysis.Razor/src/RequiredAttributeParser.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/RequiredAttributeParser.cs rename to src/Razor/CodeAnalysis.Razor/src/RequiredAttributeParser.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/Resources.resx b/src/Razor/CodeAnalysis.Razor/src/Resources.resx similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/Resources.resx rename to src/Razor/CodeAnalysis.Razor/src/Resources.resx diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/TagHelperDescriptorProviderContextExtensions.cs b/src/Razor/CodeAnalysis.Razor/src/TagHelperDescriptorProviderContextExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/TagHelperDescriptorProviderContextExtensions.cs rename to src/Razor/CodeAnalysis.Razor/src/TagHelperDescriptorProviderContextExtensions.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/TagHelperTypeVisitor.cs b/src/Razor/CodeAnalysis.Razor/src/TagHelperTypeVisitor.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/TagHelperTypeVisitor.cs rename to src/Razor/CodeAnalysis.Razor/src/TagHelperTypeVisitor.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/TagHelperTypes.cs b/src/Razor/CodeAnalysis.Razor/src/TagHelperTypes.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/TagHelperTypes.cs rename to src/Razor/CodeAnalysis.Razor/src/TagHelperTypes.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/TextChangeExtensions.cs b/src/Razor/CodeAnalysis.Razor/src/TextChangeExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/TextChangeExtensions.cs rename to src/Razor/CodeAnalysis.Razor/src/TextChangeExtensions.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/TextSpanExtensions.cs b/src/Razor/CodeAnalysis.Razor/src/TextSpanExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/TextSpanExtensions.cs rename to src/Razor/CodeAnalysis.Razor/src/TextSpanExtensions.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/baseline.netcore.json b/src/Razor/CodeAnalysis.Razor/src/baseline.netcore.json similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/baseline.netcore.json rename to src/Razor/CodeAnalysis.Razor/src/baseline.netcore.json diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/baseline.netframework.json b/src/Razor/CodeAnalysis.Razor/src/baseline.netframework.json similarity index 100% rename from src/Razor/src/Microsoft.CodeAnalysis.Razor/baseline.netframework.json rename to src/Razor/CodeAnalysis.Razor/src/baseline.netframework.json diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Test/DefaultTagHelperDescriptorFactoryTest.cs b/src/Razor/CodeAnalysis.Razor/test/DefaultTagHelperDescriptorFactoryTest.cs similarity index 100% rename from src/Razor/test/Microsoft.CodeAnalysis.Razor.Test/DefaultTagHelperDescriptorFactoryTest.cs rename to src/Razor/CodeAnalysis.Razor/test/DefaultTagHelperDescriptorFactoryTest.cs diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Test/DefaultTagHelperDescriptorProviderTest.cs b/src/Razor/CodeAnalysis.Razor/test/DefaultTagHelperDescriptorProviderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.CodeAnalysis.Razor.Test/DefaultTagHelperDescriptorProviderTest.cs rename to src/Razor/CodeAnalysis.Razor/test/DefaultTagHelperDescriptorProviderTest.cs diff --git a/src/Razor/CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj b/src/Razor/CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj new file mode 100644 index 000000000000..fba5eeee2433 --- /dev/null +++ b/src/Razor/CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj @@ -0,0 +1,27 @@ + + + + $(StandardTestTfms) + $(DefaultItemExcludes);TestFiles\**\* + true + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Test/TagHelperDescriptorFactoryTagHelpers.cs b/src/Razor/CodeAnalysis.Razor/test/TagHelperDescriptorFactoryTagHelpers.cs similarity index 100% rename from src/Razor/test/Microsoft.CodeAnalysis.Razor.Test/TagHelperDescriptorFactoryTagHelpers.cs rename to src/Razor/CodeAnalysis.Razor/test/TagHelperDescriptorFactoryTagHelpers.cs diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Test/TagHelperTypeVisitorTest.cs b/src/Razor/CodeAnalysis.Razor/test/TagHelperTypeVisitorTest.cs similarity index 100% rename from src/Razor/test/Microsoft.CodeAnalysis.Razor.Test/TagHelperTypeVisitorTest.cs rename to src/Razor/CodeAnalysis.Razor/test/TagHelperTypeVisitorTest.cs diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Test/xunit.runner.json b/src/Razor/CodeAnalysis.Razor/test/xunit.runner.json similarity index 100% rename from src/Razor/test/Microsoft.CodeAnalysis.Razor.Test/xunit.runner.json rename to src/Razor/CodeAnalysis.Razor/test/xunit.runner.json diff --git a/src/Razor/Directory.Build.props b/src/Razor/Directory.Build.props deleted file mode 100644 index 8260b6f3268c..000000000000 --- a/src/Razor/Directory.Build.props +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/Razor - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - true - Microsoft - - - - - - - diff --git a/src/Razor/Directory.Build.targets b/src/Razor/Directory.Build.targets deleted file mode 100644 index 53b3f6e1daba..000000000000 --- a/src/Razor/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(NETStandardLibrary20PackageVersion) - - diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/CSharpIdentifier.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/CSharpIdentifier.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/CSharpIdentifier.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/CSharpIdentifier.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ExtensionInitializer.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/ExtensionInitializer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ExtensionInitializer.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/ExtensionInitializer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/IInjectTargetExtension.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/IInjectTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/IInjectTargetExtension.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/IInjectTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/IViewComponentTagHelperTargetExtension.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/IViewComponentTagHelperTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/IViewComponentTagHelperTargetExtension.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/IViewComponentTagHelperTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/InjectDirective.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/InjectDirective.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/InjectDirective.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/InjectDirective.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/InjectIntermediateNode.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/InjectIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/InjectIntermediateNode.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/InjectIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/InjectTargetExtension.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/InjectTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/InjectTargetExtension.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/InjectTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/LegacySectionTargetExtension.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/LegacySectionTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/LegacySectionTargetExtension.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/LegacySectionTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj similarity index 58% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj index c6b3d3e2124c..488905a5531c 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj +++ b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj @@ -5,17 +5,19 @@ net46;netstandard2.0 $(PackageTags);aspnetcoremvc false + false + true - + Shared\CodeWriterExtensions.cs - - + + diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ModelDirective.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/ModelDirective.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ModelDirective.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/ModelDirective.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ModelExpressionPass.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/ModelExpressionPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ModelExpressionPass.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/ModelExpressionPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/MvcImportProjectFeature.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/MvcImportProjectFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/MvcImportProjectFeature.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/MvcImportProjectFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/MvcRazorTemplateEngine.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/MvcRazorTemplateEngine.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/MvcRazorTemplateEngine.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/MvcRazorTemplateEngine.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/MvcViewDocumentClassifierPass.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/MvcViewDocumentClassifierPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/MvcViewDocumentClassifierPass.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/MvcViewDocumentClassifierPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Properties/AssemblyInfo.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Properties/AssemblyInfo.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/Properties/AssemblyInfo.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Properties/Resources.Designer.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Properties/Resources.Designer.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/Properties/Resources.Designer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Properties/ViewComponentResources.Designer.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/Properties/ViewComponentResources.Designer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Properties/ViewComponentResources.Designer.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/Properties/ViewComponentResources.Designer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/RazorExtensions.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/RazorExtensions.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/RazorExtensionsDiagnosticFactory.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/RazorExtensionsDiagnosticFactory.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/RazorExtensionsDiagnosticFactory.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/RazorExtensionsDiagnosticFactory.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Resources.resx b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/Resources.resx similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Resources.resx rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/Resources.resx diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/TagHelperDescriptorExtensions.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/TagHelperDescriptorExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/TagHelperDescriptorExtensions.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/TagHelperDescriptorExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentResources.resx b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentResources.resx similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentResources.resx rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentResources.resx diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTagHelperConventions.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperConventions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTagHelperConventions.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperConventions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTagHelperDescriptorFactory.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTagHelperDescriptorFactory.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTagHelperDescriptorProvider.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorProvider.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTagHelperDescriptorProvider.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorProvider.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTagHelperIntermediateNode.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTagHelperIntermediateNode.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTagHelperMetadata.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperMetadata.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTagHelperMetadata.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperMetadata.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTagHelperPass.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTagHelperPass.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTagHelperTargetExtension.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTagHelperTargetExtension.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTypeVisitor.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTypeVisitor.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTypes.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypes.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/ViewComponentTypes.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypes.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/InjectDirectiveTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/InjectDirectiveTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/InjectDirectiveTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/InjectDirectiveTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/InjectTargetExtensionTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/InjectTargetExtensionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/InjectTargetExtensionTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/InjectTargetExtensionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/IntegrationTests/CodeGenerationIntegrationTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/LegacySectionTargetExtensionTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/LegacySectionTargetExtensionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/LegacySectionTargetExtensionTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/LegacySectionTargetExtensionTest.cs diff --git a/src/Razor/Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj new file mode 100644 index 000000000000..48fca9c7b263 --- /dev/null +++ b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj @@ -0,0 +1,38 @@ + + + + $(StandardTestTfms) + true + $(DefaultItemExcludes);TestFiles\** + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/ModelDirectiveTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/ModelDirectiveTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/ModelDirectiveTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/ModelDirectiveTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/ModelExpressionPassTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/ModelExpressionPassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/ModelExpressionPassTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/ModelExpressionPassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/MvcImportProjectFeatureTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/MvcImportProjectFeatureTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/MvcImportProjectFeatureTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/MvcImportProjectFeatureTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/MvcRazorTemplateEngineTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/MvcRazorTemplateEngineTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/MvcRazorTemplateEngineTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/MvcRazorTemplateEngineTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/MvcShim.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/MvcShim.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/MvcShim.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/MvcShim.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/MvcViewDocumentClassifierPassTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/MvcViewDocumentClassifierPassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/MvcViewDocumentClassifierPassTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/MvcViewDocumentClassifierPassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Properties/AssemblyInfo.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Properties/AssemblyInfo.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/Properties/AssemblyInfo.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/SourceMappingsSerializer.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/SourceMappingsSerializer.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/SourceMappingsSerializer.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/SourceMappingsSerializer.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TagHelperDescriptorExtensionsTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TagHelperDescriptorExtensionsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TagHelperDescriptorExtensionsTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TagHelperDescriptorExtensionsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Imports0.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Imports0.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Imports0.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Imports0.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/ViewComponentTagHelperDescriptorFactoryTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/ViewComponentTagHelperDescriptorFactoryTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/ViewComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorProviderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/ViewComponentTagHelperDescriptorProviderTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorProviderTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/ViewComponentTagHelperPassTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperPassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/ViewComponentTagHelperPassTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperPassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/ViewComponentTagHelperTargetExtensionTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperTargetExtensionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/ViewComponentTagHelperTargetExtensionTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperTargetExtensionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/ViewComponentTypeVisitorTest.cs b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/ViewComponentTypeVisitorTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/ViewComponentTypeVisitorTest.cs rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/ViewComponentTypeVisitorTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/xunit.runner.json b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/xunit.runner.json similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/xunit.runner.json rename to src/Razor/Mvc.Razor.Extensions.Version1_X/test/xunit.runner.json diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/AssemblyAttributeInjectionPass.cs b/src/Razor/Mvc.Razor.Extensions/src/AssemblyAttributeInjectionPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/AssemblyAttributeInjectionPass.cs rename to src/Razor/Mvc.Razor.Extensions/src/AssemblyAttributeInjectionPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/CSharpIdentifier.cs b/src/Razor/Mvc.Razor.Extensions/src/CSharpIdentifier.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/CSharpIdentifier.cs rename to src/Razor/Mvc.Razor.Extensions/src/CSharpIdentifier.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ExtensionInitializer.cs b/src/Razor/Mvc.Razor.Extensions/src/ExtensionInitializer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ExtensionInitializer.cs rename to src/Razor/Mvc.Razor.Extensions/src/ExtensionInitializer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/IInjectTargetExtension.cs b/src/Razor/Mvc.Razor.Extensions/src/IInjectTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/IInjectTargetExtension.cs rename to src/Razor/Mvc.Razor.Extensions/src/IInjectTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/IViewComponentTagHelperTargetExtension.cs b/src/Razor/Mvc.Razor.Extensions/src/IViewComponentTagHelperTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/IViewComponentTagHelperTargetExtension.cs rename to src/Razor/Mvc.Razor.Extensions/src/IViewComponentTagHelperTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirective.cs b/src/Razor/Mvc.Razor.Extensions/src/InjectDirective.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirective.cs rename to src/Razor/Mvc.Razor.Extensions/src/InjectDirective.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectIntermediateNode.cs b/src/Razor/Mvc.Razor.Extensions/src/InjectIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectIntermediateNode.cs rename to src/Razor/Mvc.Razor.Extensions/src/InjectIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectTargetExtension.cs b/src/Razor/Mvc.Razor.Extensions/src/InjectTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectTargetExtension.cs rename to src/Razor/Mvc.Razor.Extensions/src/InjectTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs b/src/Razor/Mvc.Razor.Extensions/src/InstrumentationPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs rename to src/Razor/Mvc.Razor.Extensions/src/InstrumentationPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj b/src/Razor/Mvc.Razor.Extensions/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj similarity index 65% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj rename to src/Razor/Mvc.Razor.Extensions/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj index 401d07c0308e..6a4715045562 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj +++ b/src/Razor/Mvc.Razor.Extensions/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj @@ -7,7 +7,7 @@ - + Shared\CodeWriterExtensions.cs @@ -18,8 +18,8 @@ - - + + diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelDirective.cs b/src/Razor/Mvc.Razor.Extensions/src/ModelDirective.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelDirective.cs rename to src/Razor/Mvc.Razor.Extensions/src/ModelDirective.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelExpressionPass.cs b/src/Razor/Mvc.Razor.Extensions/src/ModelExpressionPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelExpressionPass.cs rename to src/Razor/Mvc.Razor.Extensions/src/ModelExpressionPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/MvcImportProjectFeature.cs b/src/Razor/Mvc.Razor.Extensions/src/MvcImportProjectFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/MvcImportProjectFeature.cs rename to src/Razor/Mvc.Razor.Extensions/src/MvcImportProjectFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/MvcRazorTemplateEngine.cs b/src/Razor/Mvc.Razor.Extensions/src/MvcRazorTemplateEngine.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/MvcRazorTemplateEngine.cs rename to src/Razor/Mvc.Razor.Extensions/src/MvcRazorTemplateEngine.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/MvcViewDocumentClassifierPass.cs b/src/Razor/Mvc.Razor.Extensions/src/MvcViewDocumentClassifierPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/MvcViewDocumentClassifierPass.cs rename to src/Razor/Mvc.Razor.Extensions/src/MvcViewDocumentClassifierPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/NamespaceDirective.cs b/src/Razor/Mvc.Razor.Extensions/src/NamespaceDirective.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/NamespaceDirective.cs rename to src/Razor/Mvc.Razor.Extensions/src/NamespaceDirective.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PageDirective.cs b/src/Razor/Mvc.Razor.Extensions/src/PageDirective.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PageDirective.cs rename to src/Razor/Mvc.Razor.Extensions/src/PageDirective.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs b/src/Razor/Mvc.Razor.Extensions/src/PagesPropertyInjectionPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs rename to src/Razor/Mvc.Razor.Extensions/src/PagesPropertyInjectionPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Properties/AssemblyInfo.cs b/src/Razor/Mvc.Razor.Extensions/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Properties/AssemblyInfo.cs rename to src/Razor/Mvc.Razor.Extensions/src/Properties/AssemblyInfo.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Properties/Resources.Designer.cs b/src/Razor/Mvc.Razor.Extensions/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Properties/Resources.Designer.cs rename to src/Razor/Mvc.Razor.Extensions/src/Properties/Resources.Designer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Properties/ViewComponentResources.Designer.cs b/src/Razor/Mvc.Razor.Extensions/src/Properties/ViewComponentResources.Designer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Properties/ViewComponentResources.Designer.cs rename to src/Razor/Mvc.Razor.Extensions/src/Properties/ViewComponentResources.Designer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorExtensions.cs b/src/Razor/Mvc.Razor.Extensions/src/RazorExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorExtensions.cs rename to src/Razor/Mvc.Razor.Extensions/src/RazorExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorExtensionsDiagnosticFactory.cs b/src/Razor/Mvc.Razor.Extensions/src/RazorExtensionsDiagnosticFactory.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorExtensionsDiagnosticFactory.cs rename to src/Razor/Mvc.Razor.Extensions/src/RazorExtensionsDiagnosticFactory.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorPageDocumentClassifierPass.cs b/src/Razor/Mvc.Razor.Extensions/src/RazorPageDocumentClassifierPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorPageDocumentClassifierPass.cs rename to src/Razor/Mvc.Razor.Extensions/src/RazorPageDocumentClassifierPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Resources.resx b/src/Razor/Mvc.Razor.Extensions/src/Resources.resx similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Resources.resx rename to src/Razor/Mvc.Razor.Extensions/src/Resources.resx diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/TagHelperDescriptorExtensions.cs b/src/Razor/Mvc.Razor.Extensions/src/TagHelperDescriptorExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/TagHelperDescriptorExtensions.cs rename to src/Razor/Mvc.Razor.Extensions/src/TagHelperDescriptorExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentResources.resx b/src/Razor/Mvc.Razor.Extensions/src/ViewComponentResources.resx similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentResources.resx rename to src/Razor/Mvc.Razor.Extensions/src/ViewComponentResources.resx diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperConventions.cs b/src/Razor/Mvc.Razor.Extensions/src/ViewComponentTagHelperConventions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperConventions.cs rename to src/Razor/Mvc.Razor.Extensions/src/ViewComponentTagHelperConventions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperDescriptorFactory.cs b/src/Razor/Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperDescriptorFactory.cs rename to src/Razor/Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperDescriptorProvider.cs b/src/Razor/Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorProvider.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperDescriptorProvider.cs rename to src/Razor/Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorProvider.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperIntermediateNode.cs b/src/Razor/Mvc.Razor.Extensions/src/ViewComponentTagHelperIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperIntermediateNode.cs rename to src/Razor/Mvc.Razor.Extensions/src/ViewComponentTagHelperIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperMetadata.cs b/src/Razor/Mvc.Razor.Extensions/src/ViewComponentTagHelperMetadata.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperMetadata.cs rename to src/Razor/Mvc.Razor.Extensions/src/ViewComponentTagHelperMetadata.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs b/src/Razor/Mvc.Razor.Extensions/src/ViewComponentTagHelperPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs rename to src/Razor/Mvc.Razor.Extensions/src/ViewComponentTagHelperPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperTargetExtension.cs b/src/Razor/Mvc.Razor.Extensions/src/ViewComponentTagHelperTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperTargetExtension.cs rename to src/Razor/Mvc.Razor.Extensions/src/ViewComponentTagHelperTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTypeVisitor.cs b/src/Razor/Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTypeVisitor.cs rename to src/Razor/Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTypes.cs b/src/Razor/Mvc.Razor.Extensions/src/ViewComponentTypes.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTypes.cs rename to src/Razor/Mvc.Razor.Extensions/src/ViewComponentTypes.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/baseline.netcore.json b/src/Razor/Mvc.Razor.Extensions/src/baseline.netcore.json similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/baseline.netcore.json rename to src/Razor/Mvc.Razor.Extensions/src/baseline.netcore.json diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/baseline.netframework.json b/src/Razor/Mvc.Razor.Extensions/src/baseline.netframework.json similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/baseline.netframework.json rename to src/Razor/Mvc.Razor.Extensions/src/baseline.netframework.json diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.props b/src/Razor/Mvc.Razor.Extensions/src/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.props similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.props rename to src/Razor/Mvc.Razor.Extensions/src/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.props diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.targets b/src/Razor/Mvc.Razor.Extensions/src/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.targets similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.targets rename to src/Razor/Mvc.Razor.Extensions/src/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.targets diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/AssemblyAttributeInjectionPassTest.cs b/src/Razor/Mvc.Razor.Extensions/test/AssemblyAttributeInjectionPassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/AssemblyAttributeInjectionPassTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/AssemblyAttributeInjectionPassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InjectDirectiveTest.cs b/src/Razor/Mvc.Razor.Extensions/test/InjectDirectiveTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InjectDirectiveTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/InjectDirectiveTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InjectTargetExtensionTest.cs b/src/Razor/Mvc.Razor.Extensions/test/InjectTargetExtensionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InjectTargetExtensionTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/InjectTargetExtensionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InstrumentationPassTest.cs b/src/Razor/Mvc.Razor.Extensions/test/InstrumentationPassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InstrumentationPassTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/InstrumentationPassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/CodeGenerationIntegrationTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs b/src/Razor/Mvc.Razor.Extensions/test/IntegrationTests/InstrumentationPassIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/IntegrationTests/InstrumentationPassIntegrationTest.cs diff --git a/src/Razor/Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/src/Razor/Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj new file mode 100644 index 000000000000..1925c61e4b22 --- /dev/null +++ b/src/Razor/Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj @@ -0,0 +1,38 @@ + + + + $(StandardTestTfms) + true + $(DefaultItemExcludes);TestFiles\** + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelDirectiveTest.cs b/src/Razor/Mvc.Razor.Extensions/test/ModelDirectiveTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelDirectiveTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/ModelDirectiveTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelExpressionPassTest.cs b/src/Razor/Mvc.Razor.Extensions/test/ModelExpressionPassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelExpressionPassTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/ModelExpressionPassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/MvcImportProjectFeatureTest.cs b/src/Razor/Mvc.Razor.Extensions/test/MvcImportProjectFeatureTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/MvcImportProjectFeatureTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/MvcImportProjectFeatureTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/MvcRazorTemplateEngineTest.cs b/src/Razor/Mvc.Razor.Extensions/test/MvcRazorTemplateEngineTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/MvcRazorTemplateEngineTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/MvcRazorTemplateEngineTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/MvcShim.cs b/src/Razor/Mvc.Razor.Extensions/test/MvcShim.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/MvcShim.cs rename to src/Razor/Mvc.Razor.Extensions/test/MvcShim.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/MvcViewDocumentClassifierPassTest.cs b/src/Razor/Mvc.Razor.Extensions/test/MvcViewDocumentClassifierPassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/MvcViewDocumentClassifierPassTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/MvcViewDocumentClassifierPassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/NamespaceDirectiveTest.cs b/src/Razor/Mvc.Razor.Extensions/test/NamespaceDirectiveTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/NamespaceDirectiveTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/NamespaceDirectiveTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/PageDirectiveTest.cs b/src/Razor/Mvc.Razor.Extensions/test/PageDirectiveTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/PageDirectiveTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/PageDirectiveTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/Properties/AssemblyInfo.cs b/src/Razor/Mvc.Razor.Extensions/test/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/Properties/AssemblyInfo.cs rename to src/Razor/Mvc.Razor.Extensions/test/Properties/AssemblyInfo.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/RazorPageDocumentClassifierPassTest.cs b/src/Razor/Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/RazorPageDocumentClassifierPassTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/SourceMappingsSerializer.cs b/src/Razor/Mvc.Razor.Extensions/test/SourceMappingsSerializer.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/SourceMappingsSerializer.cs rename to src/Razor/Mvc.Razor.Extensions/test/SourceMappingsSerializer.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TagHelperDescriptorExtensionsTest.cs b/src/Razor/Mvc.Razor.Extensions/test/TagHelperDescriptorExtensionsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TagHelperDescriptorExtensionsTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/TagHelperDescriptorExtensionsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Imports0.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Imports0.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Imports0.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Imports0.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt b/src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt rename to src/Razor/Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperDescriptorFactoryTest.cs b/src/Razor/Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorFactoryTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperDescriptorFactoryTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorFactoryTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorProviderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperDescriptorProviderTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorProviderTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs b/src/Razor/Mvc.Razor.Extensions/test/ViewComponentTagHelperPassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/ViewComponentTagHelperPassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperTargetExtensionTest.cs b/src/Razor/Mvc.Razor.Extensions/test/ViewComponentTagHelperTargetExtensionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperTargetExtensionTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/ViewComponentTagHelperTargetExtensionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTypeVisitorTest.cs b/src/Razor/Mvc.Razor.Extensions/test/ViewComponentTypeVisitorTest.cs similarity index 98% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTypeVisitorTest.cs rename to src/Razor/Mvc.Razor.Extensions/test/ViewComponentTypeVisitorTest.cs index 48e8cfeec841..2a2bb61af7e3 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTypeVisitorTest.cs +++ b/src/Razor/Mvc.Razor.Extensions/test/ViewComponentTypeVisitorTest.cs @@ -13,7 +13,7 @@ public class ViewComponentTypeVisitorTest { private static readonly Assembly _assembly = typeof(ViewComponentTypeVisitorTest).GetTypeInfo().Assembly; - private static Compilation Compilation { get; } = TestCompilation.Create(_assembly); + private static CodeAnalysis.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. diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/xunit.runner.json b/src/Razor/Mvc.Razor.Extensions/test/xunit.runner.json similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/xunit.runner.json rename to src/Razor/Mvc.Razor.Extensions/test/xunit.runner.json diff --git a/src/Razor/NuGetPackageVerifier.json b/src/Razor/NuGetPackageVerifier.json deleted file mode 100644 index a6b622a7e434..000000000000 --- a/src/Razor/NuGetPackageVerifier.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "adx-nonshipping": { // Packages written by the ADX team but that don't ship on NuGet.org (thus, no need to scan anything in them) - "rules": [ - // Don't run any rules for packages the ADX team creates but doesn't ship. - ], - "packages": { - "Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources": {}, - "RazorPageGenerator": {} - } - }, - "Default": { // Rules to run for packages not listed in any other set. - "rules": [ - "DefaultCompositeRule" - ], - "packages": { - "Microsoft.AspNetCore.Razor.Design": { - "exclusions": { - "ASSEMBLY_DESCRIPTION": { - "tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions." - }, - "NEUTRAL_RESOURCES_LANGUAGE": { - "tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions." - }, - "ASSEMBLY_PRODUCT": { - "tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions." - }, - "SERVICING_ATTRIBUTE": { - "tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions." - }, - "VERSION_INFORMATIONALVERSION": { - "tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions." - }, - "WRONG_PUBLICKEYTOKEN": { - "tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions." - }, - "ASSEMBLY_INFORMATIONAL_VERSION_MISMATCH": { - "tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions." - }, - "ASSEMBLY_FILE_VERSION_MISMATCH": { - "tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions." - }, - "ASSEMBLY_VERSION_MISMATCH": { - "tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions." - } - } - } - } - } -} diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj b/src/Razor/Razor.Design/src/Microsoft.AspNetCore.Razor.Design.csproj similarity index 96% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj rename to src/Razor/Razor.Design/src/Microsoft.AspNetCore.Razor.Design.csproj index 13ab584df834..e7281a385b3c 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj +++ b/src/Razor/Razor.Design/src/Microsoft.AspNetCore.Razor.Design.csproj @@ -23,12 +23,12 @@ - + - + diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.nuspec b/src/Razor/Razor.Design/src/Microsoft.AspNetCore.Razor.Design.nuspec similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.nuspec rename to src/Razor/Razor.Design/src/Microsoft.AspNetCore.Razor.Design.nuspec diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/baseline.netcore.json b/src/Razor/Razor.Design/src/baseline.netcore.json similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Design/baseline.netcore.json rename to src/Razor/Razor.Design/src/baseline.netcore.json diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/baseline.netframework.json b/src/Razor/Razor.Design/src/baseline.netframework.json similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Design/baseline.netframework.json rename to src/Razor/Razor.Design/src/baseline.netframework.json diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets b/src/Razor/Razor.Design/src/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets rename to src/Razor/Razor.Design/src/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props b/src/Razor/Razor.Design/src/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props rename to src/Razor/Razor.Design/src/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/buildMultiTargeting/Microsoft.AspNetCore.Razor.Design.props b/src/Razor/Razor.Design/src/buildMultiTargeting/Microsoft.AspNetCore.Razor.Design.props similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Design/buildMultiTargeting/Microsoft.AspNetCore.Razor.Design.props rename to src/Razor/Razor.Design/src/buildMultiTargeting/Microsoft.AspNetCore.Razor.Design.props diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/BuildVariables.cs b/src/Razor/Razor.Design/test/IntegrationTests/BuildVariables.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/BuildVariables.cs rename to src/Razor/Razor.Design/test/IntegrationTests/BuildVariables.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/BuildVariables.cs.template b/src/Razor/Razor.Design/test/IntegrationTests/BuildVariables.cs.template similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/BuildVariables.cs.template rename to src/Razor/Razor.Design/test/IntegrationTests/BuildVariables.cs.template diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/Assert.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/Assert.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/Assert.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/Assert.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIncrementalismTest.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/BuildIncrementalismTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIncrementalismTest.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/BuildIncrementalismTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/BuildIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIntegrationTest.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/BuildIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/BuildIntrospectionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIntrospectionTest.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/BuildIntrospectionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildServerIntegrationTest.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/BuildServerIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildServerIntegrationTest.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/BuildServerIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildServerTestFixture.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/BuildServerTestFixture.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildServerTestFixture.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/BuildServerTestFixture.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ConfigurationMetadataIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ConfigurationMetadataIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/DesignTimeBuildIntegrationTest.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/DesignTimeBuildIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/DesignTimeBuildIntegrationTest.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/DesignTimeBuildIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/FIleThumbPrint.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/FIleThumbPrint.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/FIleThumbPrint.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/FIleThumbPrint.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/InitializeTestProjectAttribute.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/InitializeTestProjectAttribute.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/InitializeTestProjectAttribute.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/InitializeTestProjectAttribute.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/MSBuildIntegrationTestBase.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildIntegrationTestBase.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/MSBuildIntegrationTestBase.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildProcessKind.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/MSBuildProcessKind.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildProcessKind.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/MSBuildProcessKind.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildProcessManager.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/MSBuildProcessManager.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildProcessManager.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/MSBuildProcessManager.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildResult.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/MSBuildResult.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildResult.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/MSBuildResult.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PackIntegrationTest.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/PackIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PackIntegrationTest.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/PackIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/ProjectDirectory.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ProjectDirectory.cs similarity index 99% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/ProjectDirectory.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ProjectDirectory.cs index fcfdd30311ae..84b7e2a0c5d6 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/ProjectDirectory.cs +++ b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ProjectDirectory.cs @@ -40,7 +40,7 @@ public static ProjectDirectory Create(string originalProjectName, string targetP foreach (var project in new string[] { originalProjectName, }.Concat(additionalProjects)) { - var testAppsRoot = Path.Combine(solutionRoot, "test", "testapps"); + var testAppsRoot = Path.Combine(solutionRoot, "Razor.Design", "test", "testassets"); var projectRoot = Path.Combine(testAppsRoot, project); if (!Directory.Exists(projectRoot)) { diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PublishIntegrationTest.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/PublishIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PublishIntegrationTest.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/PublishIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/RazorCompileIntegrationTest.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/RazorCompileIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/RazorCompileIntegrationTest.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/RazorCompileIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/RazorGenerateIntegrationTest.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/RazorGenerateIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/RazorGenerateIntegrationTest.cs rename to src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/RazorGenerateIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/Microsoft.AspNetCore.Razor.Design.Test.csproj b/src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj similarity index 56% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/Microsoft.AspNetCore.Razor.Design.Test.csproj rename to src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj index 9f94326610fd..3306e919a619 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/Microsoft.AspNetCore.Razor.Design.Test.csproj +++ b/src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj @@ -1,4 +1,4 @@ - + - - + + - - false - - - + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/xunit.runner.json b/src/Razor/Razor.Design/test/IntegrationTests/xunit.runner.json similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/xunit.runner.json rename to src/Razor/Razor.Design/test/IntegrationTests/xunit.runner.json diff --git a/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj new file mode 100644 index 000000000000..4228d70045a5 --- /dev/null +++ b/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj @@ -0,0 +1,25 @@ + + + + <_RazorMSBuildRoot>$(SolutionRoot)Razor.Design\src\bin\$(Configuration)\netstandard2.0\ + + + + + + <_MvcExtensionAssemblyPath>$(SolutionRoot)Mvc.Razor.Extensions\src\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll + + + + + netcoreapp2.0 + + + + + + + + + + diff --git a/src/Razor/test/testapps/AppWithP2PReference/Models/ErrorViewModel.cs b/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Models/ErrorViewModel.cs similarity index 100% rename from src/Razor/test/testapps/AppWithP2PReference/Models/ErrorViewModel.cs rename to src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Models/ErrorViewModel.cs diff --git a/src/Razor/test/testapps/AppWithP2PReference/Program.cs b/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Program.cs similarity index 100% rename from src/Razor/test/testapps/AppWithP2PReference/Program.cs rename to src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Program.cs diff --git a/src/Razor/test/testapps/AppWithP2PReference/Views/Home/About.cshtml b/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Views/Home/About.cshtml similarity index 100% rename from src/Razor/test/testapps/AppWithP2PReference/Views/Home/About.cshtml rename to src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Views/Home/About.cshtml diff --git a/src/Razor/test/testapps/AppWithP2PReference/Views/Home/Contact.cshtml b/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Views/Home/Contact.cshtml similarity index 100% rename from src/Razor/test/testapps/AppWithP2PReference/Views/Home/Contact.cshtml rename to src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Views/Home/Contact.cshtml diff --git a/src/Razor/test/testapps/AppWithP2PReference/Views/Home/Index.cshtml b/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Views/Home/Index.cshtml similarity index 100% rename from src/Razor/test/testapps/AppWithP2PReference/Views/Home/Index.cshtml rename to src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Views/Home/Index.cshtml diff --git a/src/Razor/test/testapps/AppWithP2PReference/Views/Shared/Error.cshtml b/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Views/Shared/Error.cshtml similarity index 100% rename from src/Razor/test/testapps/AppWithP2PReference/Views/Shared/Error.cshtml rename to src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Views/Shared/Error.cshtml diff --git a/src/Razor/test/testapps/AppWithP2PReference/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from src/Razor/test/testapps/AppWithP2PReference/Views/Shared/_ValidationScriptsPartial.cshtml rename to src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/src/Razor/test/testapps/AppWithP2PReference/Views/_ViewImports.cshtml b/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Views/_ViewImports.cshtml similarity index 100% rename from src/Razor/test/testapps/AppWithP2PReference/Views/_ViewImports.cshtml rename to src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Views/_ViewImports.cshtml diff --git a/src/Razor/test/testapps/AppWithP2PReference/Views/_ViewStart.cshtml b/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Views/_ViewStart.cshtml similarity index 100% rename from src/Razor/test/testapps/AppWithP2PReference/Views/_ViewStart.cshtml rename to src/Razor/Razor.Design/test/testassets/AppWithP2PReference/Views/_ViewStart.cshtml diff --git a/src/Razor/test/testapps/ClassLibrary/Class1.cs b/src/Razor/Razor.Design/test/testassets/ClassLibrary/Class1.cs similarity index 100% rename from src/Razor/test/testapps/ClassLibrary/Class1.cs rename to src/Razor/Razor.Design/test/testassets/ClassLibrary/Class1.cs diff --git a/src/Razor/Razor.Design/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/Razor.Design/test/testassets/ClassLibrary/ClassLibrary.csproj new file mode 100644 index 000000000000..53167f346097 --- /dev/null +++ b/src/Razor/Razor.Design/test/testassets/ClassLibrary/ClassLibrary.csproj @@ -0,0 +1,28 @@ + + + + <_RazorMSBuildRoot>$(SolutionRoot)Razor.Design\src\bin\$(Configuration)\netstandard2.0\ + + + + + + + <_MvcExtensionAssemblyPath>$(SolutionRoot)Mvc.Razor.Extensions\src\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll + + + + + netstandard2.0 + + © Microsoft + Razor Test + Microsoft + ClassLibrary Description + + + + + + + diff --git a/src/Razor/test/testapps/ClassLibrary/Views/Shared/_Layout.cshtml b/src/Razor/Razor.Design/test/testassets/ClassLibrary/Views/Shared/_Layout.cshtml similarity index 100% rename from src/Razor/test/testapps/ClassLibrary/Views/Shared/_Layout.cshtml rename to src/Razor/Razor.Design/test/testassets/ClassLibrary/Views/Shared/_Layout.cshtml diff --git a/src/Razor/test/testapps/ClassLibrary/Views/_ViewImports.cshtml b/src/Razor/Razor.Design/test/testassets/ClassLibrary/Views/_ViewImports.cshtml similarity index 100% rename from src/Razor/test/testapps/ClassLibrary/Views/_ViewImports.cshtml rename to src/Razor/Razor.Design/test/testassets/ClassLibrary/Views/_ViewImports.cshtml diff --git a/src/Razor/test/testapps/ClassLibrary2/Class2.cs b/src/Razor/Razor.Design/test/testassets/ClassLibrary2/Class2.cs similarity index 100% rename from src/Razor/test/testapps/ClassLibrary2/Class2.cs rename to src/Razor/Razor.Design/test/testassets/ClassLibrary2/Class2.cs diff --git a/src/Razor/Razor.Design/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/Razor.Design/test/testassets/ClassLibrary2/ClassLibrary2.csproj new file mode 100644 index 000000000000..768ed3b76caf --- /dev/null +++ b/src/Razor/Razor.Design/test/testassets/ClassLibrary2/ClassLibrary2.csproj @@ -0,0 +1,27 @@ + + + + <_RazorMSBuildRoot>$(SolutionRoot)Razor.Design\src\bin\$(Configuration)\netstandard2.0\ + + + + + + + <_MvcExtensionAssemblyPath>$(SolutionRoot)Mvc.Razor.Extensions\src\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll + + + + + netstandard2.0 + + + + + + + + + + + diff --git a/src/Razor/test/testapps/ClassLibrary2/Views/Shared/Index.cshtml b/src/Razor/Razor.Design/test/testassets/ClassLibrary2/Views/Shared/Index.cshtml similarity index 100% rename from src/Razor/test/testapps/ClassLibrary2/Views/Shared/Index.cshtml rename to src/Razor/Razor.Design/test/testassets/ClassLibrary2/Views/Shared/Index.cshtml diff --git a/src/Razor/test/testapps/ClassLibrary2/Views/_ViewImports.cshtml b/src/Razor/Razor.Design/test/testassets/ClassLibrary2/Views/_ViewImports.cshtml similarity index 100% rename from src/Razor/test/testapps/ClassLibrary2/Views/_ViewImports.cshtml rename to src/Razor/Razor.Design/test/testassets/ClassLibrary2/Views/_ViewImports.cshtml diff --git a/src/Razor/test/testapps/Directory.Build.props b/src/Razor/Razor.Design/test/testassets/Directory.Build.props similarity index 61% rename from src/Razor/test/testapps/Directory.Build.props rename to src/Razor/Razor.Design/test/testassets/Directory.Build.props index 71e223d53c2b..96496c0d2856 100644 --- a/src/Razor/test/testapps/Directory.Build.props +++ b/src/Razor/Razor.Design/test/testassets/Directory.Build.props @@ -1,13 +1,14 @@ + - $(MSBuildThisFileDirectory)..\..\ + $(MSBuildThisFileDirectory)..\..\..\ $([MSBuild]::EnsureTrailingSlash('$(SolutionRoot)')) - $(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.props - $(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets + $(SolutionRoot)Sdk.Razor\src\build\netstandard2.0\Sdk.Razor.CurrentVersion.props + $(SolutionRoot)Sdk.Razor\src\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets @@ -17,9 +18,9 @@ - - - + + + diff --git a/src/Razor/Razor.Design/test/testassets/Directory.Build.targets b/src/Razor/Razor.Design/test/testassets/Directory.Build.targets new file mode 100644 index 000000000000..9f0486267af4 --- /dev/null +++ b/src/Razor/Razor.Design/test/testassets/Directory.Build.targets @@ -0,0 +1,4 @@ + + + + diff --git a/src/Razor/test/testapps/LinkedDir/LinkedErrorFile.cshtml b/src/Razor/Razor.Design/test/testassets/LinkedDir/LinkedErrorFile.cshtml similarity index 100% rename from src/Razor/test/testapps/LinkedDir/LinkedErrorFile.cshtml rename to src/Razor/Razor.Design/test/testassets/LinkedDir/LinkedErrorFile.cshtml diff --git a/src/Razor/test/testapps/LinkedDir/LinkedFile.cshtml b/src/Razor/Razor.Design/test/testassets/LinkedDir/LinkedFile.cshtml similarity index 100% rename from src/Razor/test/testapps/LinkedDir/LinkedFile.cshtml rename to src/Razor/Razor.Design/test/testassets/LinkedDir/LinkedFile.cshtml diff --git a/src/Razor/test/testapps/LinkedDir/LinkedFile2.cshtml b/src/Razor/Razor.Design/test/testassets/LinkedDir/LinkedFile2.cshtml similarity index 100% rename from src/Razor/test/testapps/LinkedDir/LinkedFile2.cshtml rename to src/Razor/Razor.Design/test/testassets/LinkedDir/LinkedFile2.cshtml diff --git a/src/Razor/test/testapps/LinkedDir/LinkedFile3.cshtml b/src/Razor/Razor.Design/test/testassets/LinkedDir/LinkedFile3.cshtml similarity index 100% rename from src/Razor/test/testapps/LinkedDir/LinkedFile3.cshtml rename to src/Razor/Razor.Design/test/testassets/LinkedDir/LinkedFile3.cshtml diff --git a/src/Razor/test/testapps/RazorTest.Introspection.targets b/src/Razor/Razor.Design/test/testassets/RazorTest.Introspection.targets similarity index 100% rename from src/Razor/test/testapps/RazorTest.Introspection.targets rename to src/Razor/Razor.Design/test/testassets/RazorTest.Introspection.targets diff --git a/src/Razor/test/testapps/SimpleMvc/Models/ErrorViewModel.cs b/src/Razor/Razor.Design/test/testassets/SimpleMvc/Models/ErrorViewModel.cs similarity index 100% rename from src/Razor/test/testapps/SimpleMvc/Models/ErrorViewModel.cs rename to src/Razor/Razor.Design/test/testassets/SimpleMvc/Models/ErrorViewModel.cs diff --git a/src/Razor/test/testapps/SimpleMvc/Program.cs b/src/Razor/Razor.Design/test/testassets/SimpleMvc/Program.cs similarity index 100% rename from src/Razor/test/testapps/SimpleMvc/Program.cs rename to src/Razor/Razor.Design/test/testassets/SimpleMvc/Program.cs diff --git a/src/Razor/Razor.Design/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/Razor.Design/test/testassets/SimpleMvc/SimpleMvc.csproj new file mode 100644 index 000000000000..48ae893ea9a3 --- /dev/null +++ b/src/Razor/Razor.Design/test/testassets/SimpleMvc/SimpleMvc.csproj @@ -0,0 +1,23 @@ + + + + <_RazorMSBuildRoot>$(SolutionRoot)Razor.Design\src\bin\$(Configuration)\netstandard2.0\ + + + + + + + <_MvcExtensionAssemblyPath>$(SolutionRoot)Mvc.Razor.Extensions\src\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll + + + + + netcoreapp2.0 + + + + + + + diff --git a/src/Razor/test/testapps/SimpleMvc/SimpleTagHelper.cs b/src/Razor/Razor.Design/test/testassets/SimpleMvc/SimpleTagHelper.cs similarity index 100% rename from src/Razor/test/testapps/SimpleMvc/SimpleTagHelper.cs rename to src/Razor/Razor.Design/test/testassets/SimpleMvc/SimpleTagHelper.cs diff --git a/src/Razor/test/testapps/SimpleMvc/Views/Home/About.cshtml b/src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/Home/About.cshtml similarity index 100% rename from src/Razor/test/testapps/SimpleMvc/Views/Home/About.cshtml rename to src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/Home/About.cshtml diff --git a/src/Razor/test/testapps/SimpleMvc/Views/Home/Contact.cshtml b/src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/Home/Contact.cshtml similarity index 100% rename from src/Razor/test/testapps/SimpleMvc/Views/Home/Contact.cshtml rename to src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/Home/Contact.cshtml diff --git a/src/Razor/test/testapps/SimpleMvc/Views/Home/Index.cshtml b/src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/Home/Index.cshtml similarity index 100% rename from src/Razor/test/testapps/SimpleMvc/Views/Home/Index.cshtml rename to src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/Home/Index.cshtml diff --git a/src/Razor/test/testapps/SimpleMvc/Views/Shared/Error.cshtml b/src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/Shared/Error.cshtml similarity index 100% rename from src/Razor/test/testapps/SimpleMvc/Views/Shared/Error.cshtml rename to src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/Shared/Error.cshtml diff --git a/src/Razor/test/testapps/SimpleMvc/Views/Shared/_Layout.cshtml b/src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/Shared/_Layout.cshtml similarity index 100% rename from src/Razor/test/testapps/SimpleMvc/Views/Shared/_Layout.cshtml rename to src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/Shared/_Layout.cshtml diff --git a/src/Razor/test/testapps/SimpleMvc/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from src/Razor/test/testapps/SimpleMvc/Views/Shared/_ValidationScriptsPartial.cshtml rename to src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/src/Razor/test/testapps/SimpleMvc/Views/_ViewImports.cshtml b/src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/_ViewImports.cshtml similarity index 100% rename from src/Razor/test/testapps/SimpleMvc/Views/_ViewImports.cshtml rename to src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/_ViewImports.cshtml diff --git a/src/Razor/test/testapps/SimpleMvc/Views/_ViewStart.cshtml b/src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/_ViewStart.cshtml similarity index 100% rename from src/Razor/test/testapps/SimpleMvc/Views/_ViewStart.cshtml rename to src/Razor/Razor.Design/test/testassets/SimpleMvc/Views/_ViewStart.cshtml diff --git a/src/Razor/test/testapps/SimpleMvc/wwwroot/css/site.css b/src/Razor/Razor.Design/test/testassets/SimpleMvc/wwwroot/css/site.css similarity index 100% rename from src/Razor/test/testapps/SimpleMvc/wwwroot/css/site.css rename to src/Razor/Razor.Design/test/testassets/SimpleMvc/wwwroot/css/site.css diff --git a/src/Razor/test/testapps/SimpleMvc/wwwroot/js/SimpleMvc.js b/src/Razor/Razor.Design/test/testassets/SimpleMvc/wwwroot/js/SimpleMvc.js similarity index 100% rename from src/Razor/test/testapps/SimpleMvc/wwwroot/js/SimpleMvc.js rename to src/Razor/Razor.Design/test/testassets/SimpleMvc/wwwroot/js/SimpleMvc.js diff --git a/src/Razor/test/testapps/SimpleMvcFSharp/Models/ErrorViewModel.fs b/src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/Models/ErrorViewModel.fs similarity index 100% rename from src/Razor/test/testapps/SimpleMvcFSharp/Models/ErrorViewModel.fs rename to src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/Models/ErrorViewModel.fs diff --git a/src/Razor/test/testapps/SimpleMvcFSharp/Program.fs b/src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/Program.fs similarity index 100% rename from src/Razor/test/testapps/SimpleMvcFSharp/Program.fs rename to src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/Program.fs diff --git a/src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj new file mode 100644 index 000000000000..342bd6aa30e7 --- /dev/null +++ b/src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj @@ -0,0 +1,29 @@ + + + + <_RazorMSBuildRoot>$(SolutionRoot)Razor.Design\src\bin\$(Configuration)\netstandard2.0\ + false + + + + + + + <_MvcExtensionAssemblyPath>$(SolutionRoot)Mvc.Razor.Extensions\src\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll + + + + + netcoreapp2.0 + + + + + + + + + + + + diff --git a/src/Razor/test/testapps/SimpleMvcFSharp/Views/Home/About.cshtml b/src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/Views/Home/About.cshtml similarity index 100% rename from src/Razor/test/testapps/SimpleMvcFSharp/Views/Home/About.cshtml rename to src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/Views/Home/About.cshtml diff --git a/src/Razor/test/testapps/SimpleMvcFSharp/Views/_ViewImports.cshtml b/src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/Views/_ViewImports.cshtml similarity index 100% rename from src/Razor/test/testapps/SimpleMvcFSharp/Views/_ViewImports.cshtml rename to src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/Views/_ViewImports.cshtml diff --git a/src/Razor/test/testapps/SimplePages/Areas/Products/Pages/Index.cshtml b/src/Razor/Razor.Design/test/testassets/SimplePages/Areas/Products/Pages/Index.cshtml similarity index 100% rename from src/Razor/test/testapps/SimplePages/Areas/Products/Pages/Index.cshtml rename to src/Razor/Razor.Design/test/testassets/SimplePages/Areas/Products/Pages/Index.cshtml diff --git a/src/Razor/test/testapps/SimplePages/Areas/Products/Pages/_ViewImports.cshtml b/src/Razor/Razor.Design/test/testassets/SimplePages/Areas/Products/Pages/_ViewImports.cshtml similarity index 100% rename from src/Razor/test/testapps/SimplePages/Areas/Products/Pages/_ViewImports.cshtml rename to src/Razor/Razor.Design/test/testassets/SimplePages/Areas/Products/Pages/_ViewImports.cshtml diff --git a/src/Razor/test/testapps/SimplePages/Areas/Products/Pages/_ViewStart.cshtml b/src/Razor/Razor.Design/test/testassets/SimplePages/Areas/Products/Pages/_ViewStart.cshtml similarity index 100% rename from src/Razor/test/testapps/SimplePages/Areas/Products/Pages/_ViewStart.cshtml rename to src/Razor/Razor.Design/test/testassets/SimplePages/Areas/Products/Pages/_ViewStart.cshtml diff --git a/src/Razor/test/testapps/SimplePages/Pages/About.cshtml b/src/Razor/Razor.Design/test/testassets/SimplePages/Pages/About.cshtml similarity index 100% rename from src/Razor/test/testapps/SimplePages/Pages/About.cshtml rename to src/Razor/Razor.Design/test/testassets/SimplePages/Pages/About.cshtml diff --git a/src/Razor/test/testapps/SimplePages/Pages/About.cshtml.cs b/src/Razor/Razor.Design/test/testassets/SimplePages/Pages/About.cshtml.cs similarity index 100% rename from src/Razor/test/testapps/SimplePages/Pages/About.cshtml.cs rename to src/Razor/Razor.Design/test/testassets/SimplePages/Pages/About.cshtml.cs diff --git a/src/Razor/test/testapps/SimplePages/Pages/Contact.cshtml b/src/Razor/Razor.Design/test/testassets/SimplePages/Pages/Contact.cshtml similarity index 100% rename from src/Razor/test/testapps/SimplePages/Pages/Contact.cshtml rename to src/Razor/Razor.Design/test/testassets/SimplePages/Pages/Contact.cshtml diff --git a/src/Razor/test/testapps/SimplePages/Pages/Contact.cshtml.cs b/src/Razor/Razor.Design/test/testassets/SimplePages/Pages/Contact.cshtml.cs similarity index 100% rename from src/Razor/test/testapps/SimplePages/Pages/Contact.cshtml.cs rename to src/Razor/Razor.Design/test/testassets/SimplePages/Pages/Contact.cshtml.cs diff --git a/src/Razor/test/testapps/SimplePages/Pages/Index.cshtml b/src/Razor/Razor.Design/test/testassets/SimplePages/Pages/Index.cshtml similarity index 100% rename from src/Razor/test/testapps/SimplePages/Pages/Index.cshtml rename to src/Razor/Razor.Design/test/testassets/SimplePages/Pages/Index.cshtml diff --git a/src/Razor/test/testapps/SimplePages/Pages/Index.cshtml.cs b/src/Razor/Razor.Design/test/testassets/SimplePages/Pages/Index.cshtml.cs similarity index 100% rename from src/Razor/test/testapps/SimplePages/Pages/Index.cshtml.cs rename to src/Razor/Razor.Design/test/testassets/SimplePages/Pages/Index.cshtml.cs diff --git a/src/Razor/test/testapps/SimplePages/Pages/_Layout.cshtml b/src/Razor/Razor.Design/test/testassets/SimplePages/Pages/_Layout.cshtml similarity index 100% rename from src/Razor/test/testapps/SimplePages/Pages/_Layout.cshtml rename to src/Razor/Razor.Design/test/testassets/SimplePages/Pages/_Layout.cshtml diff --git a/src/Razor/test/testapps/SimplePages/Pages/_ViewImports.cshtml b/src/Razor/Razor.Design/test/testassets/SimplePages/Pages/_ViewImports.cshtml similarity index 100% rename from src/Razor/test/testapps/SimplePages/Pages/_ViewImports.cshtml rename to src/Razor/Razor.Design/test/testassets/SimplePages/Pages/_ViewImports.cshtml diff --git a/src/Razor/test/testapps/SimplePages/Pages/_ViewStart.cshtml b/src/Razor/Razor.Design/test/testassets/SimplePages/Pages/_ViewStart.cshtml similarity index 100% rename from src/Razor/test/testapps/SimplePages/Pages/_ViewStart.cshtml rename to src/Razor/Razor.Design/test/testassets/SimplePages/Pages/_ViewStart.cshtml diff --git a/src/Razor/test/testapps/SimplePages/Program.cs b/src/Razor/Razor.Design/test/testassets/SimplePages/Program.cs similarity index 100% rename from src/Razor/test/testapps/SimplePages/Program.cs rename to src/Razor/Razor.Design/test/testassets/SimplePages/Program.cs diff --git a/src/Razor/Razor.Design/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/Razor.Design/test/testassets/SimplePages/SimplePages.csproj new file mode 100644 index 000000000000..48ae893ea9a3 --- /dev/null +++ b/src/Razor/Razor.Design/test/testassets/SimplePages/SimplePages.csproj @@ -0,0 +1,23 @@ + + + + <_RazorMSBuildRoot>$(SolutionRoot)Razor.Design\src\bin\$(Configuration)\netstandard2.0\ + + + + + + + <_MvcExtensionAssemblyPath>$(SolutionRoot)Mvc.Razor.Extensions\src\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll + + + + + netcoreapp2.0 + + + + + + + diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/AllowedChildTagDescriptor.cs b/src/Razor/Razor.Language/src/AllowedChildTagDescriptor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/AllowedChildTagDescriptor.cs rename to src/Razor/Razor.Language/src/AllowedChildTagDescriptor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/AllowedChildTagDescriptorBuilder.cs b/src/Razor/Razor.Language/src/AllowedChildTagDescriptorBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/AllowedChildTagDescriptorBuilder.cs rename to src/Razor/Razor.Language/src/AllowedChildTagDescriptorBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/AllowedChildTagDescriptorComparer.cs b/src/Razor/Razor.Language/src/AllowedChildTagDescriptorComparer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/AllowedChildTagDescriptorComparer.cs rename to src/Razor/Razor.Language/src/AllowedChildTagDescriptorComparer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/AssemblyExtension.cs b/src/Razor/Razor.Language/src/AssemblyExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/AssemblyExtension.cs rename to src/Razor/Razor.Language/src/AssemblyExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/AttributeStructure.cs b/src/Razor/Razor.Language/src/AttributeStructure.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/AttributeStructure.cs rename to src/Razor/Razor.Language/src/AttributeStructure.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/BoundAttributeDescriptor.cs b/src/Razor/Razor.Language/src/BoundAttributeDescriptor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/BoundAttributeDescriptor.cs rename to src/Razor/Razor.Language/src/BoundAttributeDescriptor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/BoundAttributeDescriptorBuilder.cs b/src/Razor/Razor.Language/src/BoundAttributeDescriptorBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/BoundAttributeDescriptorBuilder.cs rename to src/Razor/Razor.Language/src/BoundAttributeDescriptorBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/BoundAttributeDescriptorBuilderExtensions.cs b/src/Razor/Razor.Language/src/BoundAttributeDescriptorBuilderExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/BoundAttributeDescriptorBuilderExtensions.cs rename to src/Razor/Razor.Language/src/BoundAttributeDescriptorBuilderExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/BoundAttributeDescriptorComparer.cs b/src/Razor/Razor.Language/src/BoundAttributeDescriptorComparer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/BoundAttributeDescriptorComparer.cs rename to src/Razor/Razor.Language/src/BoundAttributeDescriptorComparer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/BoundAttributeDescriptorExtensions.cs b/src/Razor/Razor.Language/src/BoundAttributeDescriptorExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/BoundAttributeDescriptorExtensions.cs rename to src/Razor/Razor.Language/src/BoundAttributeDescriptorExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Checksum.cs b/src/Razor/Razor.Language/src/Checksum.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Checksum.cs rename to src/Razor/Razor.Language/src/Checksum.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeRenderingContext.cs b/src/Razor/Razor.Language/src/CodeGeneration/CodeRenderingContext.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeRenderingContext.cs rename to src/Razor/Razor.Language/src/CodeGeneration/CodeRenderingContext.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeTarget.cs b/src/Razor/Razor.Language/src/CodeGeneration/CodeTarget.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeTarget.cs rename to src/Razor/Razor.Language/src/CodeGeneration/CodeTarget.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeTargetBuilder.cs b/src/Razor/Razor.Language/src/CodeGeneration/CodeTargetBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeTargetBuilder.cs rename to src/Razor/Razor.Language/src/CodeGeneration/CodeTargetBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeWriter.cs b/src/Razor/Razor.Language/src/CodeGeneration/CodeWriter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeWriter.cs rename to src/Razor/Razor.Language/src/CodeGeneration/CodeWriter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeWriterExtensions.cs b/src/Razor/Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeWriterExtensions.cs rename to src/Razor/Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultCodeRenderingContext.cs b/src/Razor/Razor.Language/src/CodeGeneration/DefaultCodeRenderingContext.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultCodeRenderingContext.cs rename to src/Razor/Razor.Language/src/CodeGeneration/DefaultCodeRenderingContext.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultCodeTarget.cs b/src/Razor/Razor.Language/src/CodeGeneration/DefaultCodeTarget.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultCodeTarget.cs rename to src/Razor/Razor.Language/src/CodeGeneration/DefaultCodeTarget.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultCodeTargetBuilder.cs b/src/Razor/Razor.Language/src/CodeGeneration/DefaultCodeTargetBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultCodeTargetBuilder.cs rename to src/Razor/Razor.Language/src/CodeGeneration/DefaultCodeTargetBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs b/src/Razor/Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs rename to src/Razor/Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeNodeWriter.cs b/src/Razor/Razor.Language/src/CodeGeneration/DesignTimeNodeWriter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeNodeWriter.cs rename to src/Razor/Razor.Language/src/CodeGeneration/DesignTimeNodeWriter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DocumentWriter.cs b/src/Razor/Razor.Language/src/CodeGeneration/DocumentWriter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DocumentWriter.cs rename to src/Razor/Razor.Language/src/CodeGeneration/DocumentWriter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/ICodeTargetExtension.cs b/src/Razor/Razor.Language/src/CodeGeneration/ICodeTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/ICodeTargetExtension.cs rename to src/Razor/Razor.Language/src/CodeGeneration/ICodeTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IntermediateNodeWriter.cs b/src/Razor/Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IntermediateNodeWriter.cs rename to src/Razor/Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/LiteralRuntimeNodeWriter.cs b/src/Razor/Razor.Language/src/CodeGeneration/LiteralRuntimeNodeWriter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/LiteralRuntimeNodeWriter.cs rename to src/Razor/Razor.Language/src/CodeGeneration/LiteralRuntimeNodeWriter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeNodeWriter.cs b/src/Razor/Razor.Language/src/CodeGeneration/RuntimeNodeWriter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeNodeWriter.cs rename to src/Razor/Razor.Language/src/CodeGeneration/RuntimeNodeWriter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriter.cs b/src/Razor/Razor.Language/src/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriter.cs rename to src/Razor/Razor.Language/src/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/TagHelperRenderingContext.cs b/src/Razor/Razor.Language/src/CodeGeneration/TagHelperRenderingContext.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/TagHelperRenderingContext.cs rename to src/Razor/Razor.Language/src/CodeGeneration/TagHelperRenderingContext.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultAllowedChildTagDescriptor.cs b/src/Razor/Razor.Language/src/DefaultAllowedChildTagDescriptor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultAllowedChildTagDescriptor.cs rename to src/Razor/Razor.Language/src/DefaultAllowedChildTagDescriptor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultAllowedChildTagDescriptorBuilder.cs b/src/Razor/Razor.Language/src/DefaultAllowedChildTagDescriptorBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultAllowedChildTagDescriptorBuilder.cs rename to src/Razor/Razor.Language/src/DefaultAllowedChildTagDescriptorBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultBoundAttributeDescriptor.cs b/src/Razor/Razor.Language/src/DefaultBoundAttributeDescriptor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultBoundAttributeDescriptor.cs rename to src/Razor/Razor.Language/src/DefaultBoundAttributeDescriptor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultBoundAttributeDescriptorBuilder.cs b/src/Razor/Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultBoundAttributeDescriptorBuilder.cs rename to src/Razor/Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveSyntaxTreePass.cs b/src/Razor/Razor.Language/src/DefaultDirectiveSyntaxTreePass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveSyntaxTreePass.cs rename to src/Razor/Razor.Language/src/DefaultDirectiveSyntaxTreePass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultDocumentClassifierPass.cs b/src/Razor/Razor.Language/src/DefaultDocumentClassifierPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultDocumentClassifierPass.cs rename to src/Razor/Razor.Language/src/DefaultDocumentClassifierPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultDocumentClassifierPassFeature.cs b/src/Razor/Razor.Language/src/DefaultDocumentClassifierPassFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultDocumentClassifierPassFeature.cs rename to src/Razor/Razor.Language/src/DefaultDocumentClassifierPassFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultImportProjectFeature.cs b/src/Razor/Razor.Language/src/DefaultImportProjectFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultImportProjectFeature.cs rename to src/Razor/Razor.Language/src/DefaultImportProjectFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCSharpDocument.cs b/src/Razor/Razor.Language/src/DefaultRazorCSharpDocument.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCSharpDocument.cs rename to src/Razor/Razor.Language/src/DefaultRazorCSharpDocument.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCSharpLoweringPhase.cs b/src/Razor/Razor.Language/src/DefaultRazorCSharpLoweringPhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCSharpLoweringPhase.cs rename to src/Razor/Razor.Language/src/DefaultRazorCSharpLoweringPhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeDocument.cs b/src/Razor/Razor.Language/src/DefaultRazorCodeDocument.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeDocument.cs rename to src/Razor/Razor.Language/src/DefaultRazorCodeDocument.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptions.cs b/src/Razor/Razor.Language/src/DefaultRazorCodeGenerationOptions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptions.cs rename to src/Razor/Razor.Language/src/DefaultRazorCodeGenerationOptions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptionsBuilder.cs b/src/Razor/Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptionsBuilder.cs rename to src/Razor/Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptionsFactoryProjectFeature.cs b/src/Razor/Razor.Language/src/DefaultRazorCodeGenerationOptionsFactoryProjectFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptionsFactoryProjectFeature.cs rename to src/Razor/Razor.Language/src/DefaultRazorCodeGenerationOptionsFactoryProjectFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptionsFeature.cs b/src/Razor/Razor.Language/src/DefaultRazorCodeGenerationOptionsFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptionsFeature.cs rename to src/Razor/Razor.Language/src/DefaultRazorCodeGenerationOptionsFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorDiagnostic.cs b/src/Razor/Razor.Language/src/DefaultRazorDiagnostic.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorDiagnostic.cs rename to src/Razor/Razor.Language/src/DefaultRazorDiagnostic.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorDirectiveClassifierPhase.cs b/src/Razor/Razor.Language/src/DefaultRazorDirectiveClassifierPhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorDirectiveClassifierPhase.cs rename to src/Razor/Razor.Language/src/DefaultRazorDirectiveClassifierPhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorDirectiveFeature.cs b/src/Razor/Razor.Language/src/DefaultRazorDirectiveFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorDirectiveFeature.cs rename to src/Razor/Razor.Language/src/DefaultRazorDirectiveFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorDocumentClassifierPhase.cs b/src/Razor/Razor.Language/src/DefaultRazorDocumentClassifierPhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorDocumentClassifierPhase.cs rename to src/Razor/Razor.Language/src/DefaultRazorDocumentClassifierPhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorEngine.cs b/src/Razor/Razor.Language/src/DefaultRazorEngine.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorEngine.cs rename to src/Razor/Razor.Language/src/DefaultRazorEngine.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorEngineBuilder.cs b/src/Razor/Razor.Language/src/DefaultRazorEngineBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorEngineBuilder.cs rename to src/Razor/Razor.Language/src/DefaultRazorEngineBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs rename to src/Razor/Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorOptimizationPhase.cs b/src/Razor/Razor.Language/src/DefaultRazorOptimizationPhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorOptimizationPhase.cs rename to src/Razor/Razor.Language/src/DefaultRazorOptimizationPhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptions.cs b/src/Razor/Razor.Language/src/DefaultRazorParserOptions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptions.cs rename to src/Razor/Razor.Language/src/DefaultRazorParserOptions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptionsBuilder.cs b/src/Razor/Razor.Language/src/DefaultRazorParserOptionsBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptionsBuilder.cs rename to src/Razor/Razor.Language/src/DefaultRazorParserOptionsBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptionsFactoryProjectFeature.cs b/src/Razor/Razor.Language/src/DefaultRazorParserOptionsFactoryProjectFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptionsFactoryProjectFeature.cs rename to src/Razor/Razor.Language/src/DefaultRazorParserOptionsFactoryProjectFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptionsFeature.cs b/src/Razor/Razor.Language/src/DefaultRazorParserOptionsFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptionsFeature.cs rename to src/Razor/Razor.Language/src/DefaultRazorParserOptionsFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParsingPhase.cs b/src/Razor/Razor.Language/src/DefaultRazorParsingPhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParsingPhase.cs rename to src/Razor/Razor.Language/src/DefaultRazorParsingPhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorProjectEngine.cs b/src/Razor/Razor.Language/src/DefaultRazorProjectEngine.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorProjectEngine.cs rename to src/Razor/Razor.Language/src/DefaultRazorProjectEngine.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorProjectEngineBuilder.cs b/src/Razor/Razor.Language/src/DefaultRazorProjectEngineBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorProjectEngineBuilder.cs rename to src/Razor/Razor.Language/src/DefaultRazorProjectEngineBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorProjectFileSystem.cs b/src/Razor/Razor.Language/src/DefaultRazorProjectFileSystem.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorProjectFileSystem.cs rename to src/Razor/Razor.Language/src/DefaultRazorProjectFileSystem.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorProjectItem.cs b/src/Razor/Razor.Language/src/DefaultRazorProjectItem.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorProjectItem.cs rename to src/Razor/Razor.Language/src/DefaultRazorProjectItem.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorSourceLineCollection.cs b/src/Razor/Razor.Language/src/DefaultRazorSourceLineCollection.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorSourceLineCollection.cs rename to src/Razor/Razor.Language/src/DefaultRazorSourceLineCollection.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorSyntaxTree.cs b/src/Razor/Razor.Language/src/DefaultRazorSyntaxTree.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorSyntaxTree.cs rename to src/Razor/Razor.Language/src/DefaultRazorSyntaxTree.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorSyntaxTreePhase.cs b/src/Razor/Razor.Language/src/DefaultRazorSyntaxTreePhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorSyntaxTreePhase.cs rename to src/Razor/Razor.Language/src/DefaultRazorSyntaxTreePhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorTagHelperBinderPhase.cs b/src/Razor/Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorTagHelperBinderPhase.cs rename to src/Razor/Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorTargetExtensionFeature.cs b/src/Razor/Razor.Language/src/DefaultRazorTargetExtensionFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorTargetExtensionFeature.cs rename to src/Razor/Razor.Language/src/DefaultRazorTargetExtensionFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRequiredAttributeDescriptor.cs b/src/Razor/Razor.Language/src/DefaultRequiredAttributeDescriptor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRequiredAttributeDescriptor.cs rename to src/Razor/Razor.Language/src/DefaultRequiredAttributeDescriptor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRequiredAttributeDescriptorBuilder.cs b/src/Razor/Razor.Language/src/DefaultRequiredAttributeDescriptorBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRequiredAttributeDescriptorBuilder.cs rename to src/Razor/Razor.Language/src/DefaultRequiredAttributeDescriptorBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultTagHelperDescriptor.cs b/src/Razor/Razor.Language/src/DefaultTagHelperDescriptor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultTagHelperDescriptor.cs rename to src/Razor/Razor.Language/src/DefaultTagHelperDescriptor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultTagHelperDescriptorBuilder.cs b/src/Razor/Razor.Language/src/DefaultTagHelperDescriptorBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultTagHelperDescriptorBuilder.cs rename to src/Razor/Razor.Language/src/DefaultTagHelperDescriptorBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultTagMatchingRuleDescriptor.cs b/src/Razor/Razor.Language/src/DefaultTagMatchingRuleDescriptor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultTagMatchingRuleDescriptor.cs rename to src/Razor/Razor.Language/src/DefaultTagMatchingRuleDescriptor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultTagMatchingRuleDescriptorBuilder.cs b/src/Razor/Razor.Language/src/DefaultTagMatchingRuleDescriptorBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultTagMatchingRuleDescriptorBuilder.cs rename to src/Razor/Razor.Language/src/DefaultTagMatchingRuleDescriptorBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveDescriptor.cs b/src/Razor/Razor.Language/src/DirectiveDescriptor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveDescriptor.cs rename to src/Razor/Razor.Language/src/DirectiveDescriptor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveDescriptorBuilderExtensions.cs b/src/Razor/Razor.Language/src/DirectiveDescriptorBuilderExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveDescriptorBuilderExtensions.cs rename to src/Razor/Razor.Language/src/DirectiveDescriptorBuilderExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveDescriptorComparer.cs b/src/Razor/Razor.Language/src/DirectiveDescriptorComparer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveDescriptorComparer.cs rename to src/Razor/Razor.Language/src/DirectiveDescriptorComparer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveKind.cs b/src/Razor/Razor.Language/src/DirectiveKind.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveKind.cs rename to src/Razor/Razor.Language/src/DirectiveKind.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveRemovalOptimizationPass.cs b/src/Razor/Razor.Language/src/DirectiveRemovalOptimizationPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveRemovalOptimizationPass.cs rename to src/Razor/Razor.Language/src/DirectiveRemovalOptimizationPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenDescriptor.cs b/src/Razor/Razor.Language/src/DirectiveTokenDescriptor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenDescriptor.cs rename to src/Razor/Razor.Language/src/DirectiveTokenDescriptor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenDescriptorComparer.cs b/src/Razor/Razor.Language/src/DirectiveTokenDescriptorComparer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenDescriptorComparer.cs rename to src/Razor/Razor.Language/src/DirectiveTokenDescriptorComparer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenEditHandler.cs b/src/Razor/Razor.Language/src/DirectiveTokenEditHandler.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenEditHandler.cs rename to src/Razor/Razor.Language/src/DirectiveTokenEditHandler.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenKind.cs b/src/Razor/Razor.Language/src/DirectiveTokenKind.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenKind.cs rename to src/Razor/Razor.Language/src/DirectiveTokenKind.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveUsage.cs b/src/Razor/Razor.Language/src/DirectiveUsage.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveUsage.cs rename to src/Razor/Razor.Language/src/DirectiveUsage.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs b/src/Razor/Razor.Language/src/DocumentClassifierPassBase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs rename to src/Razor/Razor.Language/src/DocumentClassifierPassBase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/EmptyProjectFileSystem.cs b/src/Razor/Razor.Language/src/EmptyProjectFileSystem.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/EmptyProjectFileSystem.cs rename to src/Razor/Razor.Language/src/EmptyProjectFileSystem.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultMetadataIdentifierFeature.cs b/src/Razor/Razor.Language/src/Extensions/DefaultMetadataIdentifierFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultMetadataIdentifierFeature.cs rename to src/Razor/Razor.Language/src/Extensions/DefaultMetadataIdentifierFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperBodyIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/DefaultTagHelperBodyIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperBodyIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/DefaultTagHelperBodyIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperCreateIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/DefaultTagHelperCreateIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperCreateIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/DefaultTagHelperCreateIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperExecuteIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/DefaultTagHelperExecuteIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperExecuteIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/DefaultTagHelperExecuteIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperHtmlAttributeIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/DefaultTagHelperHtmlAttributeIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperHtmlAttributeIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/DefaultTagHelperHtmlAttributeIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperOptimizationPass.cs b/src/Razor/Razor.Language/src/Extensions/DefaultTagHelperOptimizationPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperOptimizationPass.cs rename to src/Razor/Razor.Language/src/Extensions/DefaultTagHelperOptimizationPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperPropertyIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/DefaultTagHelperPropertyIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperPropertyIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/DefaultTagHelperPropertyIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperRuntimeIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/DefaultTagHelperRuntimeIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperRuntimeIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/DefaultTagHelperRuntimeIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperTargetExtension.cs b/src/Razor/Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperTargetExtension.cs rename to src/Razor/Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectiveIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/DesignTimeDirectiveIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectiveIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/DesignTimeDirectiveIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectivePass.cs b/src/Razor/Razor.Language/src/Extensions/DesignTimeDirectivePass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectivePass.cs rename to src/Razor/Razor.Language/src/Extensions/DesignTimeDirectivePass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectiveTargetExtension.cs b/src/Razor/Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectiveTargetExtension.cs rename to src/Razor/Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/FunctionsDirective.cs b/src/Razor/Razor.Language/src/Extensions/FunctionsDirective.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/FunctionsDirective.cs rename to src/Razor/Razor.Language/src/Extensions/FunctionsDirective.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/FunctionsDirectivePass.cs b/src/Razor/Razor.Language/src/Extensions/FunctionsDirectivePass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/FunctionsDirectivePass.cs rename to src/Razor/Razor.Language/src/Extensions/FunctionsDirectivePass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/IDefaultTagHelperTargetExtension.cs b/src/Razor/Razor.Language/src/Extensions/IDefaultTagHelperTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/IDefaultTagHelperTargetExtension.cs rename to src/Razor/Razor.Language/src/Extensions/IDefaultTagHelperTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/IDesignTimeDirectiveTargetExtension.cs b/src/Razor/Razor.Language/src/Extensions/IDesignTimeDirectiveTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/IDesignTimeDirectiveTargetExtension.cs rename to src/Razor/Razor.Language/src/Extensions/IDesignTimeDirectiveTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/IMetadataAttributeTargetExtension.cs b/src/Razor/Razor.Language/src/Extensions/IMetadataAttributeTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/IMetadataAttributeTargetExtension.cs rename to src/Razor/Razor.Language/src/Extensions/IMetadataAttributeTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/IMetadataIdentifierFeature.cs b/src/Razor/Razor.Language/src/Extensions/IMetadataIdentifierFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/IMetadataIdentifierFeature.cs rename to src/Razor/Razor.Language/src/Extensions/IMetadataIdentifierFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/IPreallocatedAttributeTargetExtension.cs b/src/Razor/Razor.Language/src/Extensions/IPreallocatedAttributeTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/IPreallocatedAttributeTargetExtension.cs rename to src/Razor/Razor.Language/src/Extensions/IPreallocatedAttributeTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/ISectionTargetExtension.cs b/src/Razor/Razor.Language/src/Extensions/ISectionTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/ISectionTargetExtension.cs rename to src/Razor/Razor.Language/src/Extensions/ISectionTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/ITemplateTargetExtension.cs b/src/Razor/Razor.Language/src/Extensions/ITemplateTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/ITemplateTargetExtension.cs rename to src/Razor/Razor.Language/src/Extensions/ITemplateTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/InheritsDirective.cs b/src/Razor/Razor.Language/src/Extensions/InheritsDirective.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/InheritsDirective.cs rename to src/Razor/Razor.Language/src/Extensions/InheritsDirective.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/InheritsDirectivePass.cs b/src/Razor/Razor.Language/src/Extensions/InheritsDirectivePass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/InheritsDirectivePass.cs rename to src/Razor/Razor.Language/src/Extensions/InheritsDirectivePass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/MetadataAttributePass.cs b/src/Razor/Razor.Language/src/Extensions/MetadataAttributePass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/MetadataAttributePass.cs rename to src/Razor/Razor.Language/src/Extensions/MetadataAttributePass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/MetadataAttributeTargetExtension.cs b/src/Razor/Razor.Language/src/Extensions/MetadataAttributeTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/MetadataAttributeTargetExtension.cs rename to src/Razor/Razor.Language/src/Extensions/MetadataAttributeTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedAttributeTargetExtension.cs b/src/Razor/Razor.Language/src/Extensions/PreallocatedAttributeTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedAttributeTargetExtension.cs rename to src/Razor/Razor.Language/src/Extensions/PreallocatedAttributeTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperAttributeOptimizationPass.cs b/src/Razor/Razor.Language/src/Extensions/PreallocatedTagHelperAttributeOptimizationPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperAttributeOptimizationPass.cs rename to src/Razor/Razor.Language/src/Extensions/PreallocatedTagHelperAttributeOptimizationPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperHtmlAttributeIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/PreallocatedTagHelperHtmlAttributeIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperHtmlAttributeIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/PreallocatedTagHelperHtmlAttributeIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperHtmlAttributeValueIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/PreallocatedTagHelperHtmlAttributeValueIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperHtmlAttributeValueIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/PreallocatedTagHelperHtmlAttributeValueIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperPropertyIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/PreallocatedTagHelperPropertyIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperPropertyIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/PreallocatedTagHelperPropertyIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperPropertyValueIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/PreallocatedTagHelperPropertyValueIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperPropertyValueIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/PreallocatedTagHelperPropertyValueIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/RazorCompiledItemAttributeIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/RazorCompiledItemAttributeIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/RazorCompiledItemAttributeIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/RazorCompiledItemAttributeIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/RazorCompiledItemMetadataAttributeIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/RazorCompiledItemMetadataAttributeIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/RazorCompiledItemMetadataAttributeIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/RazorCompiledItemMetadataAttributeIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/RazorSourceChecksumAttributeIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/RazorSourceChecksumAttributeIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/RazorSourceChecksumAttributeIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/RazorSourceChecksumAttributeIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionDirective.cs b/src/Razor/Razor.Language/src/Extensions/SectionDirective.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionDirective.cs rename to src/Razor/Razor.Language/src/Extensions/SectionDirective.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionDirectivePass.cs b/src/Razor/Razor.Language/src/Extensions/SectionDirectivePass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionDirectivePass.cs rename to src/Razor/Razor.Language/src/Extensions/SectionDirectivePass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/SectionIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/SectionIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionTargetExtension.cs b/src/Razor/Razor.Language/src/Extensions/SectionTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionTargetExtension.cs rename to src/Razor/Razor.Language/src/Extensions/SectionTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/TemplateIntermediateNode.cs b/src/Razor/Razor.Language/src/Extensions/TemplateIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/TemplateIntermediateNode.cs rename to src/Razor/Razor.Language/src/Extensions/TemplateIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/TemplateTargetExtension.cs b/src/Razor/Razor.Language/src/Extensions/TemplateTargetExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/TemplateTargetExtension.cs rename to src/Razor/Razor.Language/src/Extensions/TemplateTargetExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/HtmlConventions.cs b/src/Razor/Razor.Language/src/HtmlConventions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/HtmlConventions.cs rename to src/Razor/Razor.Language/src/HtmlConventions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/HtmlNodeOptimizationPass.cs b/src/Razor/Razor.Language/src/HtmlNodeOptimizationPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/HtmlNodeOptimizationPass.cs rename to src/Razor/Razor.Language/src/HtmlNodeOptimizationPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IConfigureRazorCodeGenerationOptionsFeature.cs b/src/Razor/Razor.Language/src/IConfigureRazorCodeGenerationOptionsFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IConfigureRazorCodeGenerationOptionsFeature.cs rename to src/Razor/Razor.Language/src/IConfigureRazorCodeGenerationOptionsFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IConfigureRazorParserOptionsFeature.cs b/src/Razor/Razor.Language/src/IConfigureRazorParserOptionsFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IConfigureRazorParserOptionsFeature.cs rename to src/Razor/Razor.Language/src/IConfigureRazorParserOptionsFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IDirectiveDescriptorBuilder.cs b/src/Razor/Razor.Language/src/IDirectiveDescriptorBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IDirectiveDescriptorBuilder.cs rename to src/Razor/Razor.Language/src/IDirectiveDescriptorBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IImportProjectFeature.cs b/src/Razor/Razor.Language/src/IImportProjectFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IImportProjectFeature.cs rename to src/Razor/Razor.Language/src/IImportProjectFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorCSharpLoweringPhase.cs b/src/Razor/Razor.Language/src/IRazorCSharpLoweringPhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorCSharpLoweringPhase.cs rename to src/Razor/Razor.Language/src/IRazorCSharpLoweringPhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorCodeGenerationOptionsFactoryProjectFeature.cs b/src/Razor/Razor.Language/src/IRazorCodeGenerationOptionsFactoryProjectFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorCodeGenerationOptionsFactoryProjectFeature.cs rename to src/Razor/Razor.Language/src/IRazorCodeGenerationOptionsFactoryProjectFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorCodeGenerationOptionsFeature.cs b/src/Razor/Razor.Language/src/IRazorCodeGenerationOptionsFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorCodeGenerationOptionsFeature.cs rename to src/Razor/Razor.Language/src/IRazorCodeGenerationOptionsFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorDirectiveClassifierPass.cs b/src/Razor/Razor.Language/src/IRazorDirectiveClassifierPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorDirectiveClassifierPass.cs rename to src/Razor/Razor.Language/src/IRazorDirectiveClassifierPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorDirectiveClassifierPhase.cs b/src/Razor/Razor.Language/src/IRazorDirectiveClassifierPhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorDirectiveClassifierPhase.cs rename to src/Razor/Razor.Language/src/IRazorDirectiveClassifierPhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorDirectiveFeature.cs b/src/Razor/Razor.Language/src/IRazorDirectiveFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorDirectiveFeature.cs rename to src/Razor/Razor.Language/src/IRazorDirectiveFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorDocumentClassifierPass.cs b/src/Razor/Razor.Language/src/IRazorDocumentClassifierPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorDocumentClassifierPass.cs rename to src/Razor/Razor.Language/src/IRazorDocumentClassifierPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorDocumentClassifierPhase.cs b/src/Razor/Razor.Language/src/IRazorDocumentClassifierPhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorDocumentClassifierPhase.cs rename to src/Razor/Razor.Language/src/IRazorDocumentClassifierPhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorEngineBuilder.cs b/src/Razor/Razor.Language/src/IRazorEngineBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorEngineBuilder.cs rename to src/Razor/Razor.Language/src/IRazorEngineBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorEngineFeature.cs b/src/Razor/Razor.Language/src/IRazorEngineFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorEngineFeature.cs rename to src/Razor/Razor.Language/src/IRazorEngineFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorEnginePhase.cs b/src/Razor/Razor.Language/src/IRazorEnginePhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorEnginePhase.cs rename to src/Razor/Razor.Language/src/IRazorEnginePhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorFeature.cs b/src/Razor/Razor.Language/src/IRazorFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorFeature.cs rename to src/Razor/Razor.Language/src/IRazorFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Razor.Language/src/IRazorIntermediateNodeLoweringPhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorIntermediateNodeLoweringPhase.cs rename to src/Razor/Razor.Language/src/IRazorIntermediateNodeLoweringPhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorOptimizationPass.cs b/src/Razor/Razor.Language/src/IRazorOptimizationPass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorOptimizationPass.cs rename to src/Razor/Razor.Language/src/IRazorOptimizationPass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorOptimizationPhase.cs b/src/Razor/Razor.Language/src/IRazorOptimizationPhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorOptimizationPhase.cs rename to src/Razor/Razor.Language/src/IRazorOptimizationPhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorParserOptionsFactoryProjectFeature.cs b/src/Razor/Razor.Language/src/IRazorParserOptionsFactoryProjectFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorParserOptionsFactoryProjectFeature.cs rename to src/Razor/Razor.Language/src/IRazorParserOptionsFactoryProjectFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorParserOptionsFeature.cs b/src/Razor/Razor.Language/src/IRazorParserOptionsFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorParserOptionsFeature.cs rename to src/Razor/Razor.Language/src/IRazorParserOptionsFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorParsingPhase.cs b/src/Razor/Razor.Language/src/IRazorParsingPhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorParsingPhase.cs rename to src/Razor/Razor.Language/src/IRazorParsingPhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorProjectEngineFeature.cs b/src/Razor/Razor.Language/src/IRazorProjectEngineFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorProjectEngineFeature.cs rename to src/Razor/Razor.Language/src/IRazorProjectEngineFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorSyntaxTreePass.cs b/src/Razor/Razor.Language/src/IRazorSyntaxTreePass.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorSyntaxTreePass.cs rename to src/Razor/Razor.Language/src/IRazorSyntaxTreePass.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorSyntaxTreePhase.cs b/src/Razor/Razor.Language/src/IRazorSyntaxTreePhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorSyntaxTreePhase.cs rename to src/Razor/Razor.Language/src/IRazorSyntaxTreePhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorTagHelperBinderPhase.cs b/src/Razor/Razor.Language/src/IRazorTagHelperBinderPhase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorTagHelperBinderPhase.cs rename to src/Razor/Razor.Language/src/IRazorTagHelperBinderPhase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorTargetExtensionFeature.cs b/src/Razor/Razor.Language/src/IRazorTargetExtensionFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IRazorTargetExtensionFeature.cs rename to src/Razor/Razor.Language/src/IRazorTargetExtensionFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/ITagHelperDescriptorProvider.cs b/src/Razor/Razor.Language/src/ITagHelperDescriptorProvider.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/ITagHelperDescriptorProvider.cs rename to src/Razor/Razor.Language/src/ITagHelperDescriptorProvider.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/ITagHelperFeature.cs b/src/Razor/Razor.Language/src/ITagHelperFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/ITagHelperFeature.cs rename to src/Razor/Razor.Language/src/ITagHelperFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpCodeAttributeValueIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/CSharpCodeAttributeValueIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpCodeAttributeValueIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/CSharpCodeAttributeValueIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpCodeIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/CSharpCodeIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpCodeIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/CSharpCodeIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpExpressionAttributeValueIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/CSharpExpressionAttributeValueIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpExpressionAttributeValueIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/CSharpExpressionAttributeValueIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpExpressionIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/CSharpExpressionIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpExpressionIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/CSharpExpressionIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/ClassDeclarationIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/ClassDeclarationIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/ClassDeclarationIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/ClassDeclarationIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CommonAnnotations.cs b/src/Razor/Razor.Language/src/Intermediate/CommonAnnotations.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CommonAnnotations.cs rename to src/Razor/Razor.Language/src/Intermediate/CommonAnnotations.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DefaultRazorIntermediateNodeBuilder.cs b/src/Razor/Razor.Language/src/Intermediate/DefaultRazorIntermediateNodeBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DefaultRazorIntermediateNodeBuilder.cs rename to src/Razor/Razor.Language/src/Intermediate/DefaultRazorIntermediateNodeBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DirectiveIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/DirectiveIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DirectiveIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/DirectiveIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DirectiveTokenIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/DirectiveTokenIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DirectiveTokenIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/DirectiveTokenIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DocumentIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/DocumentIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DocumentIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/DocumentIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DocumentIntermediateNodeExtensions.cs b/src/Razor/Razor.Language/src/Intermediate/DocumentIntermediateNodeExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DocumentIntermediateNodeExtensions.cs rename to src/Razor/Razor.Language/src/Intermediate/DocumentIntermediateNodeExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/ExtensionIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/ExtensionIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/ExtensionIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/ExtensionIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/FieldDeclarationIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/FieldDeclarationIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/FieldDeclarationIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/FieldDeclarationIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/HtmlAttributeIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/HtmlAttributeIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/HtmlAttributeIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/HtmlAttributeIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/HtmlAttributeValueIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/HtmlAttributeValueIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/HtmlAttributeValueIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/HtmlAttributeValueIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/HtmlContentIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/HtmlContentIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/HtmlContentIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/HtmlContentIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IExtensionIntermediateNodeVisitor.cs b/src/Razor/Razor.Language/src/Intermediate/IExtensionIntermediateNodeVisitor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IExtensionIntermediateNodeVisitor.cs rename to src/Razor/Razor.Language/src/Intermediate/IExtensionIntermediateNodeVisitor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/IntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/IntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeBuilder.cs b/src/Razor/Razor.Language/src/Intermediate/IntermediateNodeBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeBuilder.cs rename to src/Razor/Razor.Language/src/Intermediate/IntermediateNodeBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeCollection.cs b/src/Razor/Razor.Language/src/Intermediate/IntermediateNodeCollection.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeCollection.cs rename to src/Razor/Razor.Language/src/Intermediate/IntermediateNodeCollection.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeExtensions.cs b/src/Razor/Razor.Language/src/Intermediate/IntermediateNodeExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeExtensions.cs rename to src/Razor/Razor.Language/src/Intermediate/IntermediateNodeExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeReference.cs b/src/Razor/Razor.Language/src/Intermediate/IntermediateNodeReference.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeReference.cs rename to src/Razor/Razor.Language/src/Intermediate/IntermediateNodeReference.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeVisitor.cs b/src/Razor/Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeVisitor.cs rename to src/Razor/Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeWalker.cs b/src/Razor/Razor.Language/src/Intermediate/IntermediateNodeWalker.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeWalker.cs rename to src/Razor/Razor.Language/src/Intermediate/IntermediateNodeWalker.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateToken.cs b/src/Razor/Razor.Language/src/Intermediate/IntermediateToken.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateToken.cs rename to src/Razor/Razor.Language/src/Intermediate/IntermediateToken.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/MalformedDirectiveIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/MalformedDirectiveIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/MalformedDirectiveIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/MalformedDirectiveIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/MemberDeclarationIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/MemberDeclarationIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/MemberDeclarationIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/MemberDeclarationIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/MethodDeclarationIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/MethodDeclarationIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/MethodDeclarationIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/MethodDeclarationIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/MethodParameter.cs b/src/Razor/Razor.Language/src/Intermediate/MethodParameter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/MethodParameter.cs rename to src/Razor/Razor.Language/src/Intermediate/MethodParameter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/NamespaceDeclarationIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/NamespaceDeclarationIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/NamespaceDeclarationIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/NamespaceDeclarationIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/PropertyDeclarationIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/PropertyDeclarationIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/PropertyDeclarationIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/PropertyDeclarationIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TagHelperBodyIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/TagHelperBodyIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TagHelperBodyIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/TagHelperBodyIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TagHelperHtmlAttributeIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/TagHelperHtmlAttributeIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TagHelperHtmlAttributeIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/TagHelperHtmlAttributeIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TagHelperIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/TagHelperIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TagHelperIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/TagHelperIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TagHelperPropertyIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/TagHelperPropertyIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TagHelperPropertyIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/TagHelperPropertyIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TokenKind.cs b/src/Razor/Razor.Language/src/Intermediate/TokenKind.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TokenKind.cs rename to src/Razor/Razor.Language/src/Intermediate/TokenKind.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TypeParameter.cs b/src/Razor/Razor.Language/src/Intermediate/TypeParameter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TypeParameter.cs rename to src/Razor/Razor.Language/src/Intermediate/TypeParameter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/UsingDirectiveIntermediateNode.cs b/src/Razor/Razor.Language/src/Intermediate/UsingDirectiveIntermediateNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/UsingDirectiveIntermediateNode.cs rename to src/Razor/Razor.Language/src/Intermediate/UsingDirectiveIntermediateNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/IntermediateNodePassBase.cs b/src/Razor/Razor.Language/src/IntermediateNodePassBase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/IntermediateNodePassBase.cs rename to src/Razor/Razor.Language/src/IntermediateNodePassBase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/ItemCollection.cs b/src/Razor/Razor.Language/src/ItemCollection.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/ItemCollection.cs rename to src/Razor/Razor.Language/src/ItemCollection.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/LargeTextSourceDocument.cs b/src/Razor/Razor.Language/src/LargeTextSourceDocument.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/LargeTextSourceDocument.cs rename to src/Razor/Razor.Language/src/LargeTextSourceDocument.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AcceptedCharactersInternal.cs b/src/Razor/Razor.Language/src/Legacy/AcceptedCharactersInternal.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AcceptedCharactersInternal.cs rename to src/Razor/Razor.Language/src/Legacy/AcceptedCharactersInternal.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AddImportChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/AddImportChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AddImportChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/AddImportChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AddTagHelperChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/AddTagHelperChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AddTagHelperChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/AddTagHelperChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AttributeBlockChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/AttributeBlockChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AttributeBlockChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/AttributeBlockChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AutoCompleteEditHandler.cs b/src/Razor/Razor.Language/src/Legacy/AutoCompleteEditHandler.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AutoCompleteEditHandler.cs rename to src/Razor/Razor.Language/src/Legacy/AutoCompleteEditHandler.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/BalancingModes.cs b/src/Razor/Razor.Language/src/Legacy/BalancingModes.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/BalancingModes.cs rename to src/Razor/Razor.Language/src/Legacy/BalancingModes.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Block.cs b/src/Razor/Razor.Language/src/Legacy/Block.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Block.cs rename to src/Razor/Razor.Language/src/Legacy/Block.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/BlockBuilder.cs b/src/Razor/Razor.Language/src/Legacy/BlockBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/BlockBuilder.cs rename to src/Razor/Razor.Language/src/Legacy/BlockBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/BlockExtensions.cs b/src/Razor/Razor.Language/src/Legacy/BlockExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/BlockExtensions.cs rename to src/Razor/Razor.Language/src/Legacy/BlockExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/BlockKindInternal.cs b/src/Razor/Razor.Language/src/Legacy/BlockKindInternal.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/BlockKindInternal.cs rename to src/Razor/Razor.Language/src/Legacy/BlockKindInternal.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs b/src/Razor/Razor.Language/src/Legacy/CSharpCodeParser.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs rename to src/Razor/Razor.Language/src/Legacy/CSharpCodeParser.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpKeyword.cs b/src/Razor/Razor.Language/src/Legacy/CSharpKeyword.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpKeyword.cs rename to src/Razor/Razor.Language/src/Legacy/CSharpKeyword.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpLanguageCharacteristics.cs b/src/Razor/Razor.Language/src/Legacy/CSharpLanguageCharacteristics.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpLanguageCharacteristics.cs rename to src/Razor/Razor.Language/src/Legacy/CSharpLanguageCharacteristics.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpSymbol.cs b/src/Razor/Razor.Language/src/Legacy/CSharpSymbol.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpSymbol.cs rename to src/Razor/Razor.Language/src/Legacy/CSharpSymbol.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpSymbolType.cs b/src/Razor/Razor.Language/src/Legacy/CSharpSymbolType.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpSymbolType.cs rename to src/Razor/Razor.Language/src/Legacy/CSharpSymbolType.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenizer.cs b/src/Razor/Razor.Language/src/Legacy/CSharpTokenizer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenizer.cs rename to src/Razor/Razor.Language/src/Legacy/CSharpTokenizer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ChunkGeneratorContext.cs b/src/Razor/Razor.Language/src/Legacy/ChunkGeneratorContext.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ChunkGeneratorContext.cs rename to src/Razor/Razor.Language/src/Legacy/ChunkGeneratorContext.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ConditionalAttributeCollapser.cs b/src/Razor/Razor.Language/src/Legacy/ConditionalAttributeCollapser.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ConditionalAttributeCollapser.cs rename to src/Razor/Razor.Language/src/Legacy/ConditionalAttributeCollapser.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveCSharpTokenizer.cs b/src/Razor/Razor.Language/src/Legacy/DirectiveCSharpTokenizer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveCSharpTokenizer.cs rename to src/Razor/Razor.Language/src/Legacy/DirectiveCSharpTokenizer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/DirectiveChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/DirectiveChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveHtmlTokenizer.cs b/src/Razor/Razor.Language/src/Legacy/DirectiveHtmlTokenizer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveHtmlTokenizer.cs rename to src/Razor/Razor.Language/src/Legacy/DirectiveHtmlTokenizer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveTokenChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/DirectiveTokenChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveTokenChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/DirectiveTokenChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DisposableAction.cs b/src/Razor/Razor.Language/src/Legacy/DisposableAction.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DisposableAction.cs rename to src/Razor/Razor.Language/src/Legacy/DisposableAction.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DynamicAttributeBlockChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/DynamicAttributeBlockChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DynamicAttributeBlockChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/DynamicAttributeBlockChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/EditResult.cs b/src/Razor/Razor.Language/src/Legacy/EditResult.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/EditResult.cs rename to src/Razor/Razor.Language/src/Legacy/EditResult.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ErrorSink.cs b/src/Razor/Razor.Language/src/Legacy/ErrorSink.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ErrorSink.cs rename to src/Razor/Razor.Language/src/Legacy/ErrorSink.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ExpressionChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/ExpressionChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ExpressionChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/ExpressionChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/FirstDirectiveCSharpLanguageCharacteristics.cs b/src/Razor/Razor.Language/src/Legacy/FirstDirectiveCSharpLanguageCharacteristics.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/FirstDirectiveCSharpLanguageCharacteristics.cs rename to src/Razor/Razor.Language/src/Legacy/FirstDirectiveCSharpLanguageCharacteristics.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/FirstDirectiveHtmlLanguageCharacteristics.cs b/src/Razor/Razor.Language/src/Legacy/FirstDirectiveHtmlLanguageCharacteristics.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/FirstDirectiveHtmlLanguageCharacteristics.cs rename to src/Razor/Razor.Language/src/Legacy/FirstDirectiveHtmlLanguageCharacteristics.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlLanguageCharacteristics.cs b/src/Razor/Razor.Language/src/Legacy/HtmlLanguageCharacteristics.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlLanguageCharacteristics.cs rename to src/Razor/Razor.Language/src/Legacy/HtmlLanguageCharacteristics.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs b/src/Razor/Razor.Language/src/Legacy/HtmlMarkupParser.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs rename to src/Razor/Razor.Language/src/Legacy/HtmlMarkupParser.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlSymbol.cs b/src/Razor/Razor.Language/src/Legacy/HtmlSymbol.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlSymbol.cs rename to src/Razor/Razor.Language/src/Legacy/HtmlSymbol.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlSymbolType.cs b/src/Razor/Razor.Language/src/Legacy/HtmlSymbolType.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlSymbolType.cs rename to src/Razor/Razor.Language/src/Legacy/HtmlSymbolType.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenizer.cs b/src/Razor/Razor.Language/src/Legacy/HtmlTokenizer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenizer.cs rename to src/Razor/Razor.Language/src/Legacy/HtmlTokenizer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/IParentChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/IParentChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/IParentChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/IParentChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ISpanChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/ISpanChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ISpanChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/ISpanChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ISymbol.cs b/src/Razor/Razor.Language/src/Legacy/ISymbol.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ISymbol.cs rename to src/Razor/Razor.Language/src/Legacy/ISymbol.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ITextBuffer.cs b/src/Razor/Razor.Language/src/Legacy/ITextBuffer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ITextBuffer.cs rename to src/Razor/Razor.Language/src/Legacy/ITextBuffer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ITextDocument.cs b/src/Razor/Razor.Language/src/Legacy/ITextDocument.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ITextDocument.cs rename to src/Razor/Razor.Language/src/Legacy/ITextDocument.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ITokenizer.cs b/src/Razor/Razor.Language/src/Legacy/ITokenizer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ITokenizer.cs rename to src/Razor/Razor.Language/src/Legacy/ITokenizer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ImplicitExpressionEditHandler.cs b/src/Razor/Razor.Language/src/Legacy/ImplicitExpressionEditHandler.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ImplicitExpressionEditHandler.cs rename to src/Razor/Razor.Language/src/Legacy/ImplicitExpressionEditHandler.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/KnownSymbolType.cs b/src/Razor/Razor.Language/src/Legacy/KnownSymbolType.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/KnownSymbolType.cs rename to src/Razor/Razor.Language/src/Legacy/KnownSymbolType.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LanguageCharacteristics.cs b/src/Razor/Razor.Language/src/Legacy/LanguageCharacteristics.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LanguageCharacteristics.cs rename to src/Razor/Razor.Language/src/Legacy/LanguageCharacteristics.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LineTrackingStringBuffer.cs b/src/Razor/Razor.Language/src/Legacy/LineTrackingStringBuffer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LineTrackingStringBuffer.cs rename to src/Razor/Razor.Language/src/Legacy/LineTrackingStringBuffer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LiteralAttributeChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/LiteralAttributeChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LiteralAttributeChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/LiteralAttributeChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LocationTagged.cs b/src/Razor/Razor.Language/src/Legacy/LocationTagged.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LocationTagged.cs rename to src/Razor/Razor.Language/src/Legacy/LocationTagged.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/MarkupChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/MarkupChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupRewriter.cs b/src/Razor/Razor.Language/src/Legacy/MarkupRewriter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupRewriter.cs rename to src/Razor/Razor.Language/src/Legacy/MarkupRewriter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParentChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/ParentChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParentChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/ParentChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserBase.cs b/src/Razor/Razor.Language/src/Legacy/ParserBase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserBase.cs rename to src/Razor/Razor.Language/src/Legacy/ParserBase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserContext.cs b/src/Razor/Razor.Language/src/Legacy/ParserContext.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserContext.cs rename to src/Razor/Razor.Language/src/Legacy/ParserContext.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserHelpers.cs b/src/Razor/Razor.Language/src/Legacy/ParserHelpers.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserHelpers.cs rename to src/Razor/Razor.Language/src/Legacy/ParserHelpers.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserVisitor.cs b/src/Razor/Razor.Language/src/Legacy/ParserVisitor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserVisitor.cs rename to src/Razor/Razor.Language/src/Legacy/ParserVisitor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/PartialParseResultInternal.cs b/src/Razor/Razor.Language/src/Legacy/PartialParseResultInternal.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/PartialParseResultInternal.cs rename to src/Razor/Razor.Language/src/Legacy/PartialParseResultInternal.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorCommentChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/RazorCommentChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorCommentChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/RazorCommentChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorParser.cs b/src/Razor/Razor.Language/src/Legacy/RazorParser.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorParser.cs rename to src/Razor/Razor.Language/src/Legacy/RazorParser.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RemoveTagHelperChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/RemoveTagHelperChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RemoveTagHelperChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/RemoveTagHelperChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SeekableTextReader.cs b/src/Razor/Razor.Language/src/Legacy/SeekableTextReader.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SeekableTextReader.cs rename to src/Razor/Razor.Language/src/Legacy/SeekableTextReader.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SourceLocationTracker.cs b/src/Razor/Razor.Language/src/Legacy/SourceLocationTracker.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SourceLocationTracker.cs rename to src/Razor/Razor.Language/src/Legacy/SourceLocationTracker.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Span.cs b/src/Razor/Razor.Language/src/Legacy/Span.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Span.cs rename to src/Razor/Razor.Language/src/Legacy/Span.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanBuilder.cs b/src/Razor/Razor.Language/src/Legacy/SpanBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanBuilder.cs rename to src/Razor/Razor.Language/src/Legacy/SpanBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/SpanChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/SpanChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanEditHandler.cs b/src/Razor/Razor.Language/src/Legacy/SpanEditHandler.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanEditHandler.cs rename to src/Razor/Razor.Language/src/Legacy/SpanEditHandler.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanKindInternal.cs b/src/Razor/Razor.Language/src/Legacy/SpanKindInternal.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanKindInternal.cs rename to src/Razor/Razor.Language/src/Legacy/SpanKindInternal.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/StatementChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/StatementChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/StatementChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/StatementChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SymbolBase.cs b/src/Razor/Razor.Language/src/Legacy/SymbolBase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SymbolBase.cs rename to src/Razor/Razor.Language/src/Legacy/SymbolBase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxConstants.cs b/src/Razor/Razor.Language/src/Legacy/SyntaxConstants.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxConstants.cs rename to src/Razor/Razor.Language/src/Legacy/SyntaxConstants.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeBuilder.cs b/src/Razor/Razor.Language/src/Legacy/SyntaxTreeBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeBuilder.cs rename to src/Razor/Razor.Language/src/Legacy/SyntaxTreeBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeNode.cs b/src/Razor/Razor.Language/src/Legacy/SyntaxTreeNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeNode.cs rename to src/Razor/Razor.Language/src/Legacy/SyntaxTreeNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperAttributeNode.cs b/src/Razor/Razor.Language/src/Legacy/TagHelperAttributeNode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperAttributeNode.cs rename to src/Razor/Razor.Language/src/Legacy/TagHelperAttributeNode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlock.cs b/src/Razor/Razor.Language/src/Legacy/TagHelperBlock.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlock.cs rename to src/Razor/Razor.Language/src/Legacy/TagHelperBlock.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockBuilder.cs b/src/Razor/Razor.Language/src/Legacy/TagHelperBlockBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockBuilder.cs rename to src/Razor/Razor.Language/src/Legacy/TagHelperBlockBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs b/src/Razor/Razor.Language/src/Legacy/TagHelperBlockRewriter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs rename to src/Razor/Razor.Language/src/Legacy/TagHelperBlockRewriter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/TagHelperChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/TagHelperChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperDirectiveType.cs b/src/Razor/Razor.Language/src/Legacy/TagHelperDirectiveType.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperDirectiveType.cs rename to src/Razor/Razor.Language/src/Legacy/TagHelperDirectiveType.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperParseTreeRewriter.cs b/src/Razor/Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperParseTreeRewriter.cs rename to src/Razor/Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperPrefixDirectiveChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/TagHelperPrefixDirectiveChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperPrefixDirectiveChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/TagHelperPrefixDirectiveChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TemplateBlockChunkGenerator.cs b/src/Razor/Razor.Language/src/Legacy/TemplateBlockChunkGenerator.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TemplateBlockChunkGenerator.cs rename to src/Razor/Razor.Language/src/Legacy/TemplateBlockChunkGenerator.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TextReaderExtensions.cs b/src/Razor/Razor.Language/src/Legacy/TextReaderExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TextReaderExtensions.cs rename to src/Razor/Razor.Language/src/Legacy/TextReaderExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Tokenizer.cs b/src/Razor/Razor.Language/src/Legacy/Tokenizer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Tokenizer.cs rename to src/Razor/Razor.Language/src/Legacy/Tokenizer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerBackedParser.cs b/src/Razor/Razor.Language/src/Legacy/TokenizerBackedParser.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerBackedParser.cs rename to src/Razor/Razor.Language/src/Legacy/TokenizerBackedParser.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerView.cs b/src/Razor/Razor.Language/src/Legacy/TokenizerView.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerView.cs rename to src/Razor/Razor.Language/src/Legacy/TokenizerView.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/WhiteSpaceRewriter.cs b/src/Razor/Razor.Language/src/Legacy/WhiteSpaceRewriter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/WhiteSpaceRewriter.cs rename to src/Razor/Razor.Language/src/Legacy/WhiteSpaceRewriter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj b/src/Razor/Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj similarity index 67% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj rename to src/Razor/Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj index 2cb75415c14a..62fa708da0e0 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj +++ b/src/Razor/Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/NotFoundProjectItem.cs b/src/Razor/Razor.Language/src/NotFoundProjectItem.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/NotFoundProjectItem.cs rename to src/Razor/Razor.Language/src/NotFoundProjectItem.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Properties/AssemblyInfo.cs b/src/Razor/Razor.Language/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Properties/AssemblyInfo.cs rename to src/Razor/Razor.Language/src/Properties/AssemblyInfo.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Properties/Resources.Designer.cs b/src/Razor/Razor.Language/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Properties/Resources.Designer.cs rename to src/Razor/Razor.Language/src/Properties/Resources.Designer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/ProvideRazorExtensionInitializerAttribute.cs b/src/Razor/Razor.Language/src/ProvideRazorExtensionInitializerAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/ProvideRazorExtensionInitializerAttribute.cs rename to src/Razor/Razor.Language/src/ProvideRazorExtensionInitializerAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCSharpDocument.cs b/src/Razor/Razor.Language/src/RazorCSharpDocument.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCSharpDocument.cs rename to src/Razor/Razor.Language/src/RazorCSharpDocument.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeDocument.cs b/src/Razor/Razor.Language/src/RazorCodeDocument.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeDocument.cs rename to src/Razor/Razor.Language/src/RazorCodeDocument.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeDocumentExtensions.cs b/src/Razor/Razor.Language/src/RazorCodeDocumentExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeDocumentExtensions.cs rename to src/Razor/Razor.Language/src/RazorCodeDocumentExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptions.cs b/src/Razor/Razor.Language/src/RazorCodeGenerationOptions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptions.cs rename to src/Razor/Razor.Language/src/RazorCodeGenerationOptions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptionsBuilder.cs b/src/Razor/Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptionsBuilder.cs rename to src/Razor/Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorConfiguration.cs b/src/Razor/Razor.Language/src/RazorConfiguration.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorConfiguration.cs rename to src/Razor/Razor.Language/src/RazorConfiguration.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorDiagnostic.cs b/src/Razor/Razor.Language/src/RazorDiagnostic.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorDiagnostic.cs rename to src/Razor/Razor.Language/src/RazorDiagnostic.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorDiagnosticCollection.cs b/src/Razor/Razor.Language/src/RazorDiagnosticCollection.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorDiagnosticCollection.cs rename to src/Razor/Razor.Language/src/RazorDiagnosticCollection.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorDiagnosticDescriptor.cs b/src/Razor/Razor.Language/src/RazorDiagnosticDescriptor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorDiagnosticDescriptor.cs rename to src/Razor/Razor.Language/src/RazorDiagnosticDescriptor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorDiagnosticFactory.cs b/src/Razor/Razor.Language/src/RazorDiagnosticFactory.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorDiagnosticFactory.cs rename to src/Razor/Razor.Language/src/RazorDiagnosticFactory.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorDiagnosticSeverity.cs b/src/Razor/Razor.Language/src/RazorDiagnosticSeverity.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorDiagnosticSeverity.cs rename to src/Razor/Razor.Language/src/RazorDiagnosticSeverity.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorEngine.cs b/src/Razor/Razor.Language/src/RazorEngine.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorEngine.cs rename to src/Razor/Razor.Language/src/RazorEngine.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorEngineBuilderExtensions.cs b/src/Razor/Razor.Language/src/RazorEngineBuilderExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorEngineBuilderExtensions.cs rename to src/Razor/Razor.Language/src/RazorEngineBuilderExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorEngineFeatureBase.cs b/src/Razor/Razor.Language/src/RazorEngineFeatureBase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorEngineFeatureBase.cs rename to src/Razor/Razor.Language/src/RazorEngineFeatureBase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorEnginePhaseBase.cs b/src/Razor/Razor.Language/src/RazorEnginePhaseBase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorEnginePhaseBase.cs rename to src/Razor/Razor.Language/src/RazorEnginePhaseBase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorExtension.cs b/src/Razor/Razor.Language/src/RazorExtension.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorExtension.cs rename to src/Razor/Razor.Language/src/RazorExtension.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorExtensionInitializer.cs b/src/Razor/Razor.Language/src/RazorExtensionInitializer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorExtensionInitializer.cs rename to src/Razor/Razor.Language/src/RazorExtensionInitializer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorLanguageVersion.cs b/src/Razor/Razor.Language/src/RazorLanguageVersion.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorLanguageVersion.cs rename to src/Razor/Razor.Language/src/RazorLanguageVersion.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorParserFeatureFlags.cs b/src/Razor/Razor.Language/src/RazorParserFeatureFlags.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorParserFeatureFlags.cs rename to src/Razor/Razor.Language/src/RazorParserFeatureFlags.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorParserOptions.cs b/src/Razor/Razor.Language/src/RazorParserOptions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorParserOptions.cs rename to src/Razor/Razor.Language/src/RazorParserOptions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorParserOptionsBuilder.cs b/src/Razor/Razor.Language/src/RazorParserOptionsBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorParserOptionsBuilder.cs rename to src/Razor/Razor.Language/src/RazorParserOptionsBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProject.cs b/src/Razor/Razor.Language/src/RazorProject.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProject.cs rename to src/Razor/Razor.Language/src/RazorProject.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectEngine.cs b/src/Razor/Razor.Language/src/RazorProjectEngine.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectEngine.cs rename to src/Razor/Razor.Language/src/RazorProjectEngine.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectEngineBuilder.cs b/src/Razor/Razor.Language/src/RazorProjectEngineBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectEngineBuilder.cs rename to src/Razor/Razor.Language/src/RazorProjectEngineBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectEngineBuilderExtensions.cs b/src/Razor/Razor.Language/src/RazorProjectEngineBuilderExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectEngineBuilderExtensions.cs rename to src/Razor/Razor.Language/src/RazorProjectEngineBuilderExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectEngineFeatureBase.cs b/src/Razor/Razor.Language/src/RazorProjectEngineFeatureBase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectEngineFeatureBase.cs rename to src/Razor/Razor.Language/src/RazorProjectEngineFeatureBase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectFileSystem.cs b/src/Razor/Razor.Language/src/RazorProjectFileSystem.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectFileSystem.cs rename to src/Razor/Razor.Language/src/RazorProjectFileSystem.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectItem.cs b/src/Razor/Razor.Language/src/RazorProjectItem.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectItem.cs rename to src/Razor/Razor.Language/src/RazorProjectItem.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorSourceDocument.cs b/src/Razor/Razor.Language/src/RazorSourceDocument.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorSourceDocument.cs rename to src/Razor/Razor.Language/src/RazorSourceDocument.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorSourceDocumentProperties.cs b/src/Razor/Razor.Language/src/RazorSourceDocumentProperties.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorSourceDocumentProperties.cs rename to src/Razor/Razor.Language/src/RazorSourceDocumentProperties.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorSourceLineCollection.cs b/src/Razor/Razor.Language/src/RazorSourceLineCollection.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorSourceLineCollection.cs rename to src/Razor/Razor.Language/src/RazorSourceLineCollection.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorSyntaxTree.cs b/src/Razor/Razor.Language/src/RazorSyntaxTree.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorSyntaxTree.cs rename to src/Razor/Razor.Language/src/RazorSyntaxTree.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorTemplateEngine.cs b/src/Razor/Razor.Language/src/RazorTemplateEngine.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorTemplateEngine.cs rename to src/Razor/Razor.Language/src/RazorTemplateEngine.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorTemplateEngineOptions.cs b/src/Razor/Razor.Language/src/RazorTemplateEngineOptions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorTemplateEngineOptions.cs rename to src/Razor/Razor.Language/src/RazorTemplateEngineOptions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RequiredAttributeDescriptor.cs b/src/Razor/Razor.Language/src/RequiredAttributeDescriptor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RequiredAttributeDescriptor.cs rename to src/Razor/Razor.Language/src/RequiredAttributeDescriptor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RequiredAttributeDescriptorBuilder.cs b/src/Razor/Razor.Language/src/RequiredAttributeDescriptorBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RequiredAttributeDescriptorBuilder.cs rename to src/Razor/Razor.Language/src/RequiredAttributeDescriptorBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RequiredAttributeDescriptorComparer.cs b/src/Razor/Razor.Language/src/RequiredAttributeDescriptorComparer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/RequiredAttributeDescriptorComparer.cs rename to src/Razor/Razor.Language/src/RequiredAttributeDescriptorComparer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Resources.resx b/src/Razor/Razor.Language/src/Resources.resx similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/Resources.resx rename to src/Razor/Razor.Language/src/Resources.resx diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/SourceChange.cs b/src/Razor/Razor.Language/src/SourceChange.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/SourceChange.cs rename to src/Razor/Razor.Language/src/SourceChange.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/SourceLocation.cs b/src/Razor/Razor.Language/src/SourceLocation.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/SourceLocation.cs rename to src/Razor/Razor.Language/src/SourceLocation.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/SourceMapping.cs b/src/Razor/Razor.Language/src/SourceMapping.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/SourceMapping.cs rename to src/Razor/Razor.Language/src/SourceMapping.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/SourceSpan.cs b/src/Razor/Razor.Language/src/SourceSpan.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/SourceSpan.cs rename to src/Razor/Razor.Language/src/SourceSpan.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/StreamSourceDocument.cs b/src/Razor/Razor.Language/src/StreamSourceDocument.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/StreamSourceDocument.cs rename to src/Razor/Razor.Language/src/StreamSourceDocument.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/StringSourceDocument.cs b/src/Razor/Razor.Language/src/StringSourceDocument.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/StringSourceDocument.cs rename to src/Razor/Razor.Language/src/StringSourceDocument.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/SuppressChecksumOptionsFeature.cs b/src/Razor/Razor.Language/src/SuppressChecksumOptionsFeature.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/SuppressChecksumOptionsFeature.cs rename to src/Razor/Razor.Language/src/SuppressChecksumOptionsFeature.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperBinder.cs b/src/Razor/Razor.Language/src/TagHelperBinder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperBinder.cs rename to src/Razor/Razor.Language/src/TagHelperBinder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperBinding.cs b/src/Razor/Razor.Language/src/TagHelperBinding.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperBinding.cs rename to src/Razor/Razor.Language/src/TagHelperBinding.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperConventions.cs b/src/Razor/Razor.Language/src/TagHelperConventions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperConventions.cs rename to src/Razor/Razor.Language/src/TagHelperConventions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptor.cs b/src/Razor/Razor.Language/src/TagHelperDescriptor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptor.cs rename to src/Razor/Razor.Language/src/TagHelperDescriptor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptorBuilder.cs b/src/Razor/Razor.Language/src/TagHelperDescriptorBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptorBuilder.cs rename to src/Razor/Razor.Language/src/TagHelperDescriptorBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptorBuilderExtensions.cs b/src/Razor/Razor.Language/src/TagHelperDescriptorBuilderExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptorBuilderExtensions.cs rename to src/Razor/Razor.Language/src/TagHelperDescriptorBuilderExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptorComparer.cs b/src/Razor/Razor.Language/src/TagHelperDescriptorComparer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptorComparer.cs rename to src/Razor/Razor.Language/src/TagHelperDescriptorComparer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptorExtensions.cs b/src/Razor/Razor.Language/src/TagHelperDescriptorExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptorExtensions.cs rename to src/Razor/Razor.Language/src/TagHelperDescriptorExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptorProviderContext.cs b/src/Razor/Razor.Language/src/TagHelperDescriptorProviderContext.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptorProviderContext.cs rename to src/Razor/Razor.Language/src/TagHelperDescriptorProviderContext.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperDocumentContext.cs b/src/Razor/Razor.Language/src/TagHelperDocumentContext.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperDocumentContext.cs rename to src/Razor/Razor.Language/src/TagHelperDocumentContext.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperMatchingConventions.cs b/src/Razor/Razor.Language/src/TagHelperMatchingConventions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperMatchingConventions.cs rename to src/Razor/Razor.Language/src/TagHelperMatchingConventions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperMetadata.cs b/src/Razor/Razor.Language/src/TagHelperMetadata.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperMetadata.cs rename to src/Razor/Razor.Language/src/TagHelperMetadata.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagMatchingRuleDescriptor.cs b/src/Razor/Razor.Language/src/TagMatchingRuleDescriptor.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagMatchingRuleDescriptor.cs rename to src/Razor/Razor.Language/src/TagMatchingRuleDescriptor.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagMatchingRuleDescriptorBuilder.cs b/src/Razor/Razor.Language/src/TagMatchingRuleDescriptorBuilder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagMatchingRuleDescriptorBuilder.cs rename to src/Razor/Razor.Language/src/TagMatchingRuleDescriptorBuilder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagMatchingRuleDescriptorComparer.cs b/src/Razor/Razor.Language/src/TagMatchingRuleDescriptorComparer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagMatchingRuleDescriptorComparer.cs rename to src/Razor/Razor.Language/src/TagMatchingRuleDescriptorComparer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagMode.cs b/src/Razor/Razor.Language/src/TagMode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagMode.cs rename to src/Razor/Razor.Language/src/TagMode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagStructure.cs b/src/Razor/Razor.Language/src/TagStructure.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagStructure.cs rename to src/Razor/Razor.Language/src/TagStructure.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/VirtualRazorProjectFileSystem.cs b/src/Razor/Razor.Language/src/VirtualRazorProjectFileSystem.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/VirtualRazorProjectFileSystem.cs rename to src/Razor/Razor.Language/src/VirtualRazorProjectFileSystem.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/baseline.netcore.json b/src/Razor/Razor.Language/src/baseline.netcore.json similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/baseline.netcore.json rename to src/Razor/Razor.Language/src/baseline.netcore.json diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/baseline.netframework.json b/src/Razor/Razor.Language/src/baseline.netframework.json similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Language/baseline.netframework.json rename to src/Razor/Razor.Language/src/baseline.netframework.json diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/BoundAttributeDescriptorExtensionsTest.cs b/src/Razor/Razor.Language/test/BoundAttributeDescriptorExtensionsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/BoundAttributeDescriptorExtensionsTest.cs rename to src/Razor/Razor.Language/test/BoundAttributeDescriptorExtensionsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/CSharpCodeWriterTest.cs b/src/Razor/Razor.Language/test/CodeGeneration/CSharpCodeWriterTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/CSharpCodeWriterTest.cs rename to src/Razor/Razor.Language/test/CodeGeneration/CSharpCodeWriterTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/CodeTargetTest.cs b/src/Razor/Razor.Language/test/CodeGeneration/CodeTargetTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/CodeTargetTest.cs rename to src/Razor/Razor.Language/test/CodeGeneration/CodeTargetTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultCodeTargetBuilderTest.cs b/src/Razor/Razor.Language/test/CodeGeneration/DefaultCodeTargetBuilderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultCodeTargetBuilderTest.cs rename to src/Razor/Razor.Language/test/CodeGeneration/DefaultCodeTargetBuilderTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultCodeTargetTest.cs b/src/Razor/Razor.Language/test/CodeGeneration/DefaultCodeTargetTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultCodeTargetTest.cs rename to src/Razor/Razor.Language/test/CodeGeneration/DefaultCodeTargetTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultDocumentWriterTest.cs b/src/Razor/Razor.Language/test/CodeGeneration/DefaultDocumentWriterTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultDocumentWriterTest.cs rename to src/Razor/Razor.Language/test/CodeGeneration/DefaultDocumentWriterTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeNodeWriterTest.cs b/src/Razor/Razor.Language/test/CodeGeneration/DesignTimeNodeWriterTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeNodeWriterTest.cs rename to src/Razor/Razor.Language/test/CodeGeneration/DesignTimeNodeWriterTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/LiteralRuntimeNodeWriterTest.cs b/src/Razor/Razor.Language/test/CodeGeneration/LiteralRuntimeNodeWriterTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/LiteralRuntimeNodeWriterTest.cs rename to src/Razor/Razor.Language/test/CodeGeneration/LiteralRuntimeNodeWriterTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeNodeWriterTest.cs b/src/Razor/Razor.Language/test/CodeGeneration/RuntimeNodeWriterTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeNodeWriterTest.cs rename to src/Razor/Razor.Language/test/CodeGeneration/RuntimeNodeWriterTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriterTest.cs b/src/Razor/Razor.Language/test/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriterTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriterTest.cs rename to src/Razor/Razor.Language/test/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriterTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultAllowedChildTagDescriptorBuilderTest.cs b/src/Razor/Razor.Language/test/DefaultAllowedChildTagDescriptorBuilderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultAllowedChildTagDescriptorBuilderTest.cs rename to src/Razor/Razor.Language/test/DefaultAllowedChildTagDescriptorBuilderTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultBoundAttributeDescriptorBuilderTest.cs b/src/Razor/Razor.Language/test/DefaultBoundAttributeDescriptorBuilderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultBoundAttributeDescriptorBuilderTest.cs rename to src/Razor/Razor.Language/test/DefaultBoundAttributeDescriptorBuilderTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultDocumentClassifierPassTest.cs b/src/Razor/Razor.Language/test/DefaultDocumentClassifierPassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultDocumentClassifierPassTest.cs rename to src/Razor/Razor.Language/test/DefaultDocumentClassifierPassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultItemCollectionTest.cs b/src/Razor/Razor.Language/test/DefaultItemCollectionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultItemCollectionTest.cs rename to src/Razor/Razor.Language/test/DefaultItemCollectionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorCSharpLoweringPhaseTest.cs b/src/Razor/Razor.Language/test/DefaultRazorCSharpLoweringPhaseTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorCSharpLoweringPhaseTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorCSharpLoweringPhaseTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorCodeDocumentTest.cs b/src/Razor/Razor.Language/test/DefaultRazorCodeDocumentTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorCodeDocumentTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorCodeDocumentTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorDiagnosticTest.cs b/src/Razor/Razor.Language/test/DefaultRazorDiagnosticTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorDiagnosticTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorDiagnosticTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorDirectiveClassifierPhaseTest.cs b/src/Razor/Razor.Language/test/DefaultRazorDirectiveClassifierPhaseTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorDirectiveClassifierPhaseTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorDirectiveClassifierPhaseTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorDocumentClassifierPhaseTest.cs b/src/Razor/Razor.Language/test/DefaultRazorDocumentClassifierPhaseTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorDocumentClassifierPhaseTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorDocumentClassifierPhaseTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorEngineBuilderTest.cs b/src/Razor/Razor.Language/test/DefaultRazorEngineBuilderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorEngineBuilderTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorEngineBuilderTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorEngineTest.cs b/src/Razor/Razor.Language/test/DefaultRazorEngineTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorEngineTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorEngineTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs b/src/Razor/Razor.Language/test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIntermediateNodeLoweringPhaseTest.cs b/src/Razor/Razor.Language/test/DefaultRazorIntermediateNodeLoweringPhaseTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIntermediateNodeLoweringPhaseTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorIntermediateNodeLoweringPhaseTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorOptimizationPhaseTest.cs b/src/Razor/Razor.Language/test/DefaultRazorOptimizationPhaseTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorOptimizationPhaseTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorOptimizationPhaseTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorParsingPhaseTest.cs b/src/Razor/Razor.Language/test/DefaultRazorParsingPhaseTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorParsingPhaseTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorParsingPhaseTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorProjectEngineBuilderTest.cs b/src/Razor/Razor.Language/test/DefaultRazorProjectEngineBuilderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorProjectEngineBuilderTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorProjectEngineBuilderTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorProjectEngineIntegrationTest.cs b/src/Razor/Razor.Language/test/DefaultRazorProjectEngineIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorProjectEngineIntegrationTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorProjectEngineIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorProjectEngineTest.cs b/src/Razor/Razor.Language/test/DefaultRazorProjectEngineTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorProjectEngineTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorProjectEngineTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorProjectFileSystemTest.cs b/src/Razor/Razor.Language/test/DefaultRazorProjectFileSystemTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorProjectFileSystemTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorProjectFileSystemTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorProjectItemTest.cs b/src/Razor/Razor.Language/test/DefaultRazorProjectItemTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorProjectItemTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorProjectItemTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorSyntaxTreePhaseTest.cs b/src/Razor/Razor.Language/test/DefaultRazorSyntaxTreePhaseTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorSyntaxTreePhaseTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorSyntaxTreePhaseTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorTagHelperBinderPhaseTest.cs b/src/Razor/Razor.Language/test/DefaultRazorTagHelperBinderPhaseTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorTagHelperBinderPhaseTest.cs rename to src/Razor/Razor.Language/test/DefaultRazorTagHelperBinderPhaseTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRequiredAttributeDescriptorBuilderTest.cs b/src/Razor/Razor.Language/test/DefaultRequiredAttributeDescriptorBuilderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRequiredAttributeDescriptorBuilderTest.cs rename to src/Razor/Razor.Language/test/DefaultRequiredAttributeDescriptorBuilderTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DirectiveDescriptorBuilderExtensionsTest.cs b/src/Razor/Razor.Language/test/DirectiveDescriptorBuilderExtensionsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DirectiveDescriptorBuilderExtensionsTest.cs rename to src/Razor/Razor.Language/test/DirectiveDescriptorBuilderExtensionsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DirectiveDescriptorTest.cs b/src/Razor/Razor.Language/test/DirectiveDescriptorTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DirectiveDescriptorTest.cs rename to src/Razor/Razor.Language/test/DirectiveDescriptorTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DirectiveRemovalOptimizationPassTest.cs b/src/Razor/Razor.Language/test/DirectiveRemovalOptimizationPassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DirectiveRemovalOptimizationPassTest.cs rename to src/Razor/Razor.Language/test/DirectiveRemovalOptimizationPassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DirectiveTokenEditHandlerTest.cs b/src/Razor/Razor.Language/test/DirectiveTokenEditHandlerTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DirectiveTokenEditHandlerTest.cs rename to src/Razor/Razor.Language/test/DirectiveTokenEditHandlerTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DocumentClassifierPassBaseTest.cs b/src/Razor/Razor.Language/test/DocumentClassifierPassBaseTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DocumentClassifierPassBaseTest.cs rename to src/Razor/Razor.Language/test/DocumentClassifierPassBaseTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DefaultMetadataIdentifierFeatureTest.cs b/src/Razor/Razor.Language/test/Extensions/DefaultMetadataIdentifierFeatureTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DefaultMetadataIdentifierFeatureTest.cs rename to src/Razor/Razor.Language/test/Extensions/DefaultMetadataIdentifierFeatureTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DefaultTagHelperOptimizationPassTest.cs b/src/Razor/Razor.Language/test/Extensions/DefaultTagHelperOptimizationPassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DefaultTagHelperOptimizationPassTest.cs rename to src/Razor/Razor.Language/test/Extensions/DefaultTagHelperOptimizationPassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DefaultTagHelperTargetExtensionTest.cs b/src/Razor/Razor.Language/test/Extensions/DefaultTagHelperTargetExtensionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DefaultTagHelperTargetExtensionTest.cs rename to src/Razor/Razor.Language/test/Extensions/DefaultTagHelperTargetExtensionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs b/src/Razor/Razor.Language/test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs rename to src/Razor/Razor.Language/test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/FunctionsDirectivePassTest.cs b/src/Razor/Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/FunctionsDirectivePassTest.cs rename to src/Razor/Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/InheritsDirectivePassTest.cs b/src/Razor/Razor.Language/test/Extensions/InheritsDirectivePassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/InheritsDirectivePassTest.cs rename to src/Razor/Razor.Language/test/Extensions/InheritsDirectivePassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/MetadataAttributePassTest.cs b/src/Razor/Razor.Language/test/Extensions/MetadataAttributePassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/MetadataAttributePassTest.cs rename to src/Razor/Razor.Language/test/Extensions/MetadataAttributePassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/MetadataAttributeTargetExtensionTest.cs b/src/Razor/Razor.Language/test/Extensions/MetadataAttributeTargetExtensionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/MetadataAttributeTargetExtensionTest.cs rename to src/Razor/Razor.Language/test/Extensions/MetadataAttributeTargetExtensionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/PreallocatedAttributeTargetExtensionTest.cs b/src/Razor/Razor.Language/test/Extensions/PreallocatedAttributeTargetExtensionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/PreallocatedAttributeTargetExtensionTest.cs rename to src/Razor/Razor.Language/test/Extensions/PreallocatedAttributeTargetExtensionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/SectionDirectivePassTest.cs b/src/Razor/Razor.Language/test/Extensions/SectionDirectivePassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/SectionDirectivePassTest.cs rename to src/Razor/Razor.Language/test/Extensions/SectionDirectivePassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/SectionTargetExtensionTest.cs b/src/Razor/Razor.Language/test/Extensions/SectionTargetExtensionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/SectionTargetExtensionTest.cs rename to src/Razor/Razor.Language/test/Extensions/SectionTargetExtensionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/TemplateTargetExtensionTest.cs b/src/Razor/Razor.Language/test/Extensions/TemplateTargetExtensionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/TemplateTargetExtensionTest.cs rename to src/Razor/Razor.Language/test/Extensions/TemplateTargetExtensionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/HtmlConventionsTest.cs b/src/Razor/Razor.Language/test/HtmlConventionsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/HtmlConventionsTest.cs rename to src/Razor/Razor.Language/test/HtmlConventionsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/HtmlNodeOptimizationPassTest.cs b/src/Razor/Razor.Language/test/HtmlNodeOptimizationPassTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/HtmlNodeOptimizationPassTest.cs rename to src/Razor/Razor.Language/test/HtmlNodeOptimizationPassTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/BasicIntegrationTest.cs b/src/Razor/Razor.Language/test/IntegrationTests/BasicIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/BasicIntegrationTest.cs rename to src/Razor/Razor.Language/test/IntegrationTests/BasicIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/CodeGenerationIntegrationTest.cs rename to src/Razor/Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/ExtensibleDirectiveTest.cs b/src/Razor/Razor.Language/test/IntegrationTests/ExtensibleDirectiveTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/ExtensibleDirectiveTest.cs rename to src/Razor/Razor.Language/test/IntegrationTests/ExtensibleDirectiveTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/HtmlAttributeIntegrationTest.cs b/src/Razor/Razor.Language/test/IntegrationTests/HtmlAttributeIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/HtmlAttributeIntegrationTest.cs rename to src/Razor/Razor.Language/test/IntegrationTests/HtmlAttributeIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/RazorTemplateEngineIntegrationTest.cs b/src/Razor/Razor.Language/test/IntegrationTests/RazorTemplateEngineIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/RazorTemplateEngineIntegrationTest.cs rename to src/Razor/Razor.Language/test/IntegrationTests/RazorTemplateEngineIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TagHelpersIntegrationTest.cs b/src/Razor/Razor.Language/test/IntegrationTests/TagHelpersIntegrationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TagHelpersIntegrationTest.cs rename to src/Razor/Razor.Language/test/IntegrationTests/TagHelpersIntegrationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TestTagHelperDescriptors.cs b/src/Razor/Razor.Language/test/IntegrationTests/TestTagHelperDescriptors.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TestTagHelperDescriptors.cs rename to src/Razor/Razor.Language/test/IntegrationTests/TestTagHelperDescriptors.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/DefaultRazorIntermediateNodeBuilderTest.cs b/src/Razor/Razor.Language/test/Intermediate/DefaultRazorIntermediateNodeBuilderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/DefaultRazorIntermediateNodeBuilderTest.cs rename to src/Razor/Razor.Language/test/Intermediate/DefaultRazorIntermediateNodeBuilderTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/DocumentIntermediateNodeExtensionsTest.cs b/src/Razor/Razor.Language/test/Intermediate/DocumentIntermediateNodeExtensionsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/DocumentIntermediateNodeExtensionsTest.cs rename to src/Razor/Razor.Language/test/Intermediate/DocumentIntermediateNodeExtensionsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/ExtensionIntermediateNodeTest.cs b/src/Razor/Razor.Language/test/Intermediate/ExtensionIntermediateNodeTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/ExtensionIntermediateNodeTest.cs rename to src/Razor/Razor.Language/test/Intermediate/ExtensionIntermediateNodeTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/IntermediateNodeReferenceTest.cs b/src/Razor/Razor.Language/test/Intermediate/IntermediateNodeReferenceTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/IntermediateNodeReferenceTest.cs rename to src/Razor/Razor.Language/test/Intermediate/IntermediateNodeReferenceTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/IntermediateNodeWalkerTest.cs b/src/Razor/Razor.Language/test/Intermediate/IntermediateNodeWalkerTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/IntermediateNodeWalkerTest.cs rename to src/Razor/Razor.Language/test/Intermediate/IntermediateNodeWalkerTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/LargeTextSourceDocumentTest.cs b/src/Razor/Razor.Language/test/LargeTextSourceDocumentTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/LargeTextSourceDocumentTest.cs rename to src/Razor/Razor.Language/test/LargeTextSourceDocumentTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/BaselineWriter.cs b/src/Razor/Razor.Language/test/Legacy/BaselineWriter.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/BaselineWriter.cs rename to src/Razor/Razor.Language/test/Legacy/BaselineWriter.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/BlockTest.cs b/src/Razor/Razor.Language/test/Legacy/BlockTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/BlockTest.cs rename to src/Razor/Razor.Language/test/Legacy/BlockTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpAutoCompleteTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpAutoCompleteTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpAutoCompleteTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpAutoCompleteTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpBlockTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpBlockTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpBlockTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpBlockTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpDirectivesTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpDirectivesTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpDirectivesTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpDirectivesTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpErrorTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpErrorTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpErrorTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpErrorTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpExplicitExpressionTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpExplicitExpressionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpExplicitExpressionTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpExplicitExpressionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpImplicitExpressionTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpImplicitExpressionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpImplicitExpressionTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpImplicitExpressionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpLanguageCharacteristicsTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpLanguageCharacteristicsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpLanguageCharacteristicsTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpLanguageCharacteristicsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpNestedStatementsTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpNestedStatementsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpNestedStatementsTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpNestedStatementsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpRazorCommentsTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpRazorCommentsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpRazorCommentsTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpRazorCommentsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpReservedWordsTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpReservedWordsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpReservedWordsTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpReservedWordsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSectionTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpSectionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSectionTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpSectionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSpecialBlockTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpSpecialBlockTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSpecialBlockTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpSpecialBlockTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpStatementTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpStatementTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpStatementTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpStatementTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTemplateTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpTemplateTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTemplateTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpTemplateTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpToMarkupSwitchTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpToMarkupSwitchTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpToMarkupSwitchTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpToMarkupSwitchTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerCommentTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpTokenizerCommentTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerCommentTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpTokenizerCommentTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerIdentifierTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpTokenizerIdentifierTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerIdentifierTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpTokenizerIdentifierTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerLiteralTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpTokenizerLiteralTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerLiteralTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpTokenizerLiteralTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerOperatorsTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpTokenizerOperatorsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerOperatorsTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpTokenizerOperatorsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpTokenizerTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpTokenizerTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTestBase.cs b/src/Razor/Razor.Language/test/Legacy/CSharpTokenizerTestBase.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTestBase.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpTokenizerTestBase.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpVerbatimBlockTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpVerbatimBlockTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpVerbatimBlockTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpVerbatimBlockTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpWhitespaceHandlingTest.cs b/src/Razor/Razor.Language/test/Legacy/CSharpWhitespaceHandlingTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpWhitespaceHandlingTest.cs rename to src/Razor/Razor.Language/test/Legacy/CSharpWhitespaceHandlingTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CodeParserTestBase.cs b/src/Razor/Razor.Language/test/Legacy/CodeParserTestBase.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CodeParserTestBase.cs rename to src/Razor/Razor.Language/test/Legacy/CodeParserTestBase.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CsHtmlCodeParserTestBase.cs b/src/Razor/Razor.Language/test/Legacy/CsHtmlCodeParserTestBase.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CsHtmlCodeParserTestBase.cs rename to src/Razor/Razor.Language/test/Legacy/CsHtmlCodeParserTestBase.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CsHtmlMarkupParserTestBase.cs b/src/Razor/Razor.Language/test/Legacy/CsHtmlMarkupParserTestBase.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CsHtmlMarkupParserTestBase.cs rename to src/Razor/Razor.Language/test/Legacy/CsHtmlMarkupParserTestBase.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveCSharpTokenizerTest.cs b/src/Razor/Razor.Language/test/Legacy/DirectiveCSharpTokenizerTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveCSharpTokenizerTest.cs rename to src/Razor/Razor.Language/test/Legacy/DirectiveCSharpTokenizerTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveHtmlTokenizerTest.cs b/src/Razor/Razor.Language/test/Legacy/DirectiveHtmlTokenizerTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveHtmlTokenizerTest.cs rename to src/Razor/Razor.Language/test/Legacy/DirectiveHtmlTokenizerTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DisposableActionTest.cs b/src/Razor/Razor.Language/test/Legacy/DisposableActionTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DisposableActionTest.cs rename to src/Razor/Razor.Language/test/Legacy/DisposableActionTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/ExceptionHelpers.cs b/src/Razor/Razor.Language/test/Legacy/ExceptionHelpers.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/ExceptionHelpers.cs rename to src/Razor/Razor.Language/test/Legacy/ExceptionHelpers.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlAttributeTest.cs b/src/Razor/Razor.Language/test/Legacy/HtmlAttributeTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlAttributeTest.cs rename to src/Razor/Razor.Language/test/Legacy/HtmlAttributeTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlBlockTest.cs b/src/Razor/Razor.Language/test/Legacy/HtmlBlockTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlBlockTest.cs rename to src/Razor/Razor.Language/test/Legacy/HtmlBlockTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlDocumentTest.cs b/src/Razor/Razor.Language/test/Legacy/HtmlDocumentTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlDocumentTest.cs rename to src/Razor/Razor.Language/test/Legacy/HtmlDocumentTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlErrorTest.cs b/src/Razor/Razor.Language/test/Legacy/HtmlErrorTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlErrorTest.cs rename to src/Razor/Razor.Language/test/Legacy/HtmlErrorTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlMarkupParserTests.cs b/src/Razor/Razor.Language/test/Legacy/HtmlMarkupParserTests.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlMarkupParserTests.cs rename to src/Razor/Razor.Language/test/Legacy/HtmlMarkupParserTests.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlParserTestUtils.cs b/src/Razor/Razor.Language/test/Legacy/HtmlParserTestUtils.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlParserTestUtils.cs rename to src/Razor/Razor.Language/test/Legacy/HtmlParserTestUtils.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTagsTest.cs b/src/Razor/Razor.Language/test/Legacy/HtmlTagsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTagsTest.cs rename to src/Razor/Razor.Language/test/Legacy/HtmlTagsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlToCodeSwitchTest.cs b/src/Razor/Razor.Language/test/Legacy/HtmlToCodeSwitchTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlToCodeSwitchTest.cs rename to src/Razor/Razor.Language/test/Legacy/HtmlToCodeSwitchTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTest.cs b/src/Razor/Razor.Language/test/Legacy/HtmlTokenizerTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTest.cs rename to src/Razor/Razor.Language/test/Legacy/HtmlTokenizerTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTestBase.cs b/src/Razor/Razor.Language/test/Legacy/HtmlTokenizerTestBase.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTestBase.cs rename to src/Razor/Razor.Language/test/Legacy/HtmlTokenizerTestBase.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/LineTrackingStringBufferTest.cs b/src/Razor/Razor.Language/test/Legacy/LineTrackingStringBufferTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/LineTrackingStringBufferTest.cs rename to src/Razor/Razor.Language/test/Legacy/LineTrackingStringBufferTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/MarkupParserTestBase.cs b/src/Razor/Razor.Language/test/Legacy/MarkupParserTestBase.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/MarkupParserTestBase.cs rename to src/Razor/Razor.Language/test/Legacy/MarkupParserTestBase.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/MiscUtils.cs b/src/Razor/Razor.Language/test/Legacy/MiscUtils.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/MiscUtils.cs rename to src/Razor/Razor.Language/test/Legacy/MiscUtils.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorParserTest.cs b/src/Razor/Razor.Language/test/Legacy/RazorParserTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorParserTest.cs rename to src/Razor/Razor.Language/test/Legacy/RazorParserTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/SourceLocationTrackerTest.cs b/src/Razor/Razor.Language/test/Legacy/SourceLocationTrackerTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/SourceLocationTrackerTest.cs rename to src/Razor/Razor.Language/test/Legacy/SourceLocationTrackerTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/SpanTest.cs b/src/Razor/Razor.Language/test/Legacy/SpanTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/SpanTest.cs rename to src/Razor/Razor.Language/test/Legacy/SpanTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs b/src/Razor/Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs rename to src/Razor/Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockTest.cs b/src/Razor/Razor.Language/test/Legacy/TagHelperBlockTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockTest.cs rename to src/Razor/Razor.Language/test/Legacy/TagHelperBlockTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs b/src/Razor/Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs rename to src/Razor/Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperRewritingTestBase.cs b/src/Razor/Razor.Language/test/Legacy/TagHelperRewritingTestBase.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperRewritingTestBase.cs rename to src/Razor/Razor.Language/test/Legacy/TagHelperRewritingTestBase.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TextReaderExtensionsTest.cs b/src/Razor/Razor.Language/test/Legacy/TextReaderExtensionsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TextReaderExtensionsTest.cs rename to src/Razor/Razor.Language/test/Legacy/TextReaderExtensionsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerLookaheadTest.cs b/src/Razor/Razor.Language/test/Legacy/TokenizerLookaheadTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerLookaheadTest.cs rename to src/Razor/Razor.Language/test/Legacy/TokenizerLookaheadTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerTestBase.cs b/src/Razor/Razor.Language/test/Legacy/TokenizerTestBase.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerTestBase.cs rename to src/Razor/Razor.Language/test/Legacy/TokenizerTestBase.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/WhiteSpaceRewriterTest.cs b/src/Razor/Razor.Language/test/Legacy/WhiteSpaceRewriterTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/WhiteSpaceRewriterTest.cs rename to src/Razor/Razor.Language/test/Legacy/WhiteSpaceRewriterTest.cs diff --git a/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj new file mode 100644 index 000000000000..9d6b0c33f8fb --- /dev/null +++ b/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj @@ -0,0 +1,22 @@ + + + + netcoreapp2.1;net46 + $(TargetFrameworks) + $(TargetFrameworks);net46 + $(DefaultItemExcludes);TestFiles\**\* + $(DefineConstants);GENERATE_BASELINES + + + + + + + + + + + + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Properties/AssemblyInfo.cs b/src/Razor/Razor.Language/test/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Properties/AssemblyInfo.cs rename to src/Razor/Razor.Language/test/Properties/AssemblyInfo.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorCodeDocumentExtensionsTest.cs b/src/Razor/Razor.Language/test/RazorCodeDocumentExtensionsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorCodeDocumentExtensionsTest.cs rename to src/Razor/Razor.Language/test/RazorCodeDocumentExtensionsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorCodeDocumentTest.cs b/src/Razor/Razor.Language/test/RazorCodeDocumentTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorCodeDocumentTest.cs rename to src/Razor/Razor.Language/test/RazorCodeDocumentTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorDiagnosticDescriptorTest.cs b/src/Razor/Razor.Language/test/RazorDiagnosticDescriptorTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorDiagnosticDescriptorTest.cs rename to src/Razor/Razor.Language/test/RazorDiagnosticDescriptorTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorDiagnosticTest.cs b/src/Razor/Razor.Language/test/RazorDiagnosticTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorDiagnosticTest.cs rename to src/Razor/Razor.Language/test/RazorDiagnosticTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorEngineBuilderExtensionsTest.cs b/src/Razor/Razor.Language/test/RazorEngineBuilderExtensionsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorEngineBuilderExtensionsTest.cs rename to src/Razor/Razor.Language/test/RazorEngineBuilderExtensionsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorEngineTest.cs b/src/Razor/Razor.Language/test/RazorEngineTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorEngineTest.cs rename to src/Razor/Razor.Language/test/RazorEngineTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorParserFeatureFlagsTest.cs b/src/Razor/Razor.Language/test/RazorParserFeatureFlagsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorParserFeatureFlagsTest.cs rename to src/Razor/Razor.Language/test/RazorParserFeatureFlagsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorProjectEngineBuilderExtensionsTest.cs b/src/Razor/Razor.Language/test/RazorProjectEngineBuilderExtensionsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorProjectEngineBuilderExtensionsTest.cs rename to src/Razor/Razor.Language/test/RazorProjectEngineBuilderExtensionsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorProjectEngineFeatureBaseTest.cs b/src/Razor/Razor.Language/test/RazorProjectEngineFeatureBaseTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorProjectEngineFeatureBaseTest.cs rename to src/Razor/Razor.Language/test/RazorProjectEngineFeatureBaseTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorProjectEngineTest.cs b/src/Razor/Razor.Language/test/RazorProjectEngineTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorProjectEngineTest.cs rename to src/Razor/Razor.Language/test/RazorProjectEngineTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorProjectItemTest.cs b/src/Razor/Razor.Language/test/RazorProjectItemTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorProjectItemTest.cs rename to src/Razor/Razor.Language/test/RazorProjectItemTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorProjectTest.cs b/src/Razor/Razor.Language/test/RazorProjectTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorProjectTest.cs rename to src/Razor/Razor.Language/test/RazorProjectTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorSourceDocumentTest.cs b/src/Razor/Razor.Language/test/RazorSourceDocumentTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorSourceDocumentTest.cs rename to src/Razor/Razor.Language/test/RazorSourceDocumentTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorSyntaxTreeTest.cs b/src/Razor/Razor.Language/test/RazorSyntaxTreeTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorSyntaxTreeTest.cs rename to src/Razor/Razor.Language/test/RazorSyntaxTreeTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorTemplateEngineTest.cs b/src/Razor/Razor.Language/test/RazorTemplateEngineTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorTemplateEngineTest.cs rename to src/Razor/Razor.Language/test/RazorTemplateEngineTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs b/src/Razor/Razor.Language/test/SourceChangeTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs rename to src/Razor/Razor.Language/test/SourceChangeTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/SourceLocationTest.cs b/src/Razor/Razor.Language/test/SourceLocationTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/SourceLocationTest.cs rename to src/Razor/Razor.Language/test/SourceLocationTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/SourceSpanTest.cs b/src/Razor/Razor.Language/test/SourceSpanTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/SourceSpanTest.cs rename to src/Razor/Razor.Language/test/SourceSpanTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/StreamSourceDocumentTest.cs b/src/Razor/Razor.Language/test/StreamSourceDocumentTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/StreamSourceDocumentTest.cs rename to src/Razor/Razor.Language/test/StreamSourceDocumentTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/StringSourceDocumentTest.cs b/src/Razor/Razor.Language/test/StringSourceDocumentTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/StringSourceDocumentTest.cs rename to src/Razor/Razor.Language/test/StringSourceDocumentTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperBinderTest.cs b/src/Razor/Razor.Language/test/TagHelperBinderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperBinderTest.cs rename to src/Razor/Razor.Language/test/TagHelperBinderTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperDescriptorBuilderTest.cs b/src/Razor/Razor.Language/test/TagHelperDescriptorBuilderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperDescriptorBuilderTest.cs rename to src/Razor/Razor.Language/test/TagHelperDescriptorBuilderTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperDescriptorExtensionsTest.cs b/src/Razor/Razor.Language/test/TagHelperDescriptorExtensionsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperDescriptorExtensionsTest.cs rename to src/Razor/Razor.Language/test/TagHelperDescriptorExtensionsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperMatchingConventionsTest.cs b/src/Razor/Razor.Language/test/TagHelperMatchingConventionsTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperMatchingConventionsTest.cs rename to src/Razor/Razor.Language/test/TagHelperMatchingConventionsTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperParseTreeRewriterTests.cs b/src/Razor/Razor.Language/test/TagHelperParseTreeRewriterTests.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperParseTreeRewriterTests.cs rename to src/Razor/Razor.Language/test/TagHelperParseTreeRewriterTests.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/DefaultRazorProjectFileSystem/Home.cshtml b/src/Razor/Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Home.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/DefaultRazorProjectFileSystem/Home.cshtml rename to src/Razor/Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Home.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/DefaultRazorProjectFileSystem/Views/About/About.cshtml b/src/Razor/Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/About/About.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/DefaultRazorProjectFileSystem/Views/About/About.cshtml rename to src/Razor/Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/About/About.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.cshtml b/src/Razor/Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.cshtml rename to src/Razor/Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.txt b/src/Razor/Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.txt rename to src/Razor/Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/_ViewImports.cshtml b/src/Razor/Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/_ViewImports.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/_ViewImports.cshtml rename to src/Razor/Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/_ViewImports.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/DefaultRazorProjectFileSystem/Views/_ViewImports.cshtml b/src/Razor/Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/_ViewImports.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/DefaultRazorProjectFileSystem/Views/_ViewImports.cshtml rename to src/Razor/Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/_ViewImports.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/DefaultRazorProjectFileSystem/_ViewImports.cshtml b/src/Razor/Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/_ViewImports.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/DefaultRazorProjectFileSystem/_ViewImports.cshtml rename to src/Razor/Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/_ViewImports.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Imports0.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Imports0.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Imports0.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Imports0.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Imports1.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Imports1.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Imports1.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Imports1.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.diagnostics.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.diagnostics.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.diagnostics.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.diagnostics.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.mappings.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.mappings.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.mappings.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.mappings.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithBaseType.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithBaseType.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithBaseType.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithBaseType.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithBaseType.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithBaseType.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithBaseType.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithBaseType.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithConfigureClass.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithConfigureClass.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithConfigureClass.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithConfigureClass.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithConfigureClass.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithConfigureClass.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithConfigureClass.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithConfigureClass.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithDefaults.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithDefaults.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithDefaults.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithDefaults.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithDefaults.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithDefaults.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithDefaults.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithDefaults.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithSetNamespace.codegen.cs b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithSetNamespace.codegen.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithSetNamespace.codegen.cs rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithSetNamespace.codegen.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithSetNamespace.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithSetNamespace.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithSetNamespace.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/RazorTemplateEngineIntegrationTest/GenerateCodeWithSetNamespace.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.cshtml b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.cshtml rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.ir.txt b/src/Razor/Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.ir.txt similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.ir.txt rename to src/Razor/Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.ir.txt diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/Source/BasicMarkup.cshtml b/src/Razor/Razor.Language/test/TestFiles/Source/BasicMarkup.cshtml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/Source/BasicMarkup.cshtml rename to src/Razor/Razor.Language/test/TestFiles/Source/BasicMarkup.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/nested-1000.html b/src/Razor/Razor.Language/test/TestFiles/nested-1000.html similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/nested-1000.html rename to src/Razor/Razor.Language/test/TestFiles/nested-1000.html diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestRazorProject.cs b/src/Razor/Razor.Language/test/TestRazorProject.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestRazorProject.cs rename to src/Razor/Razor.Language/test/TestRazorProject.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/VirtualRazorProjectFileSystemTest.cs b/src/Razor/Razor.Language/test/VirtualRazorProjectFileSystemTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/VirtualRazorProjectFileSystemTest.cs rename to src/Razor/Razor.Language/test/VirtualRazorProjectFileSystemTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/xunit.runner.json b/src/Razor/Razor.Language/test/xunit.runner.json similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/xunit.runner.json rename to src/Razor/Razor.Language/test/xunit.runner.json diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/DefaultRazorCompiledItem.cs b/src/Razor/Razor.Runtime/src/Hosting/DefaultRazorCompiledItem.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/DefaultRazorCompiledItem.cs rename to src/Razor/Razor.Runtime/src/Hosting/DefaultRazorCompiledItem.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/IRazorSourceChecksumMetadata.cs b/src/Razor/Razor.Runtime/src/Hosting/IRazorSourceChecksumMetadata.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/IRazorSourceChecksumMetadata.cs rename to src/Razor/Razor.Runtime/src/Hosting/IRazorSourceChecksumMetadata.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItem.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItem.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItem.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItem.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemAttribute.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemAttribute.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemExtensions.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemExtensions.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemLoader.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemLoader.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemLoader.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemLoader.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemMetadataAttribute.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemMetadataAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemMetadataAttribute.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemMetadataAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorConfigurationNameAttribute.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorConfigurationNameAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorConfigurationNameAttribute.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorConfigurationNameAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorExtensionAssemblyNameAttribute.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorExtensionAssemblyNameAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorExtensionAssemblyNameAttribute.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorExtensionAssemblyNameAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorLanguageVersionAttribute.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorLanguageVersionAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorLanguageVersionAttribute.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorLanguageVersionAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorSourceChecksumAttribute.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorSourceChecksumAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorSourceChecksumAttribute.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorSourceChecksumAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj b/src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj similarity index 60% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj rename to src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj index e3102cbf8ffc..46c29b51cf3c 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj +++ b/src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj @@ -7,11 +7,15 @@ - + - + + + + + diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Properties/AssemblyInfo.cs b/src/Razor/Razor.Runtime/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Properties/AssemblyInfo.cs rename to src/Razor/Razor.Runtime/src/Properties/AssemblyInfo.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Properties/Resources.Designer.cs b/src/Razor/Razor.Runtime/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Properties/Resources.Designer.cs rename to src/Razor/Razor.Runtime/src/Properties/Resources.Designer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Resources.resx b/src/Razor/Razor.Runtime/src/Resources.resx similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Resources.resx rename to src/Razor/Razor.Runtime/src/Resources.resx diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs b/src/Razor/Razor.Runtime/src/Runtime/TagHelpers/TagHelperExecutionContext.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs rename to src/Razor/Razor.Runtime/src/Runtime/TagHelpers/TagHelperExecutionContext.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs b/src/Razor/Razor.Runtime/src/Runtime/TagHelpers/TagHelperRunner.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs rename to src/Razor/Razor.Runtime/src/Runtime/TagHelpers/TagHelperRunner.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs b/src/Razor/Razor.Runtime/src/Runtime/TagHelpers/TagHelperScopeManager.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs rename to src/Razor/Razor.Runtime/src/Runtime/TagHelpers/TagHelperScopeManager.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/baseline.netcore.json b/src/Razor/Razor.Runtime/src/baseline.netcore.json similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/baseline.netcore.json rename to src/Razor/Razor.Runtime/src/baseline.netcore.json diff --git a/src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj b/src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj new file mode 100644 index 000000000000..f7c41bfcd5f1 --- /dev/null +++ b/src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj @@ -0,0 +1,21 @@ + + + + $(StandardTestTfms) + $(DefaultItemExcludes);TestFiles\**\* + + + + + + + + + + + + + + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs rename to src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperRunnerTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs rename to src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperRunnerTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs rename to src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs rename to src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs rename to src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml b/src/Razor/Razor.Runtime/test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml rename to src/Razor/Razor.Runtime/test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml b/src/Razor/Razor.Runtime/test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml rename to src/Razor/Razor.Runtime/test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml b/src/Razor/Razor.Runtime/test/TestFiles/Localized/en/TagHelperDocumentation.xml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml rename to src/Razor/Razor.Runtime/test/TestFiles/Localized/en/TagHelperDocumentation.xml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml b/src/Razor/Razor.Runtime/test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml rename to src/Razor/Razor.Runtime/test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml b/src/Razor/Razor.Runtime/test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml rename to src/Razor/Razor.Runtime/test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml b/src/Razor/Razor.Runtime/test/TestFiles/NotLocalized/TagHelperDocumentation.xml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml rename to src/Razor/Razor.Runtime/test/TestFiles/NotLocalized/TagHelperDocumentation.xml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/xunit.runner.json b/src/Razor/Razor.Runtime/test/xunit.runner.json similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/xunit.runner.json rename to src/Razor/Razor.Runtime/test/xunit.runner.json diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tasks/DotnetToolTask.cs b/src/Razor/Razor.Tasks/src/DotnetToolTask.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tasks/DotnetToolTask.cs rename to src/Razor/Razor.Tasks/src/DotnetToolTask.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tasks/Microsoft.AspNetCore.Razor.Tasks.csproj b/src/Razor/Razor.Tasks/src/Microsoft.AspNetCore.Razor.Tasks.csproj similarity index 52% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tasks/Microsoft.AspNetCore.Razor.Tasks.csproj rename to src/Razor/Razor.Tasks/src/Microsoft.AspNetCore.Razor.Tasks.csproj index 79eefc909b82..896f765ce1f1 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.Tasks/Microsoft.AspNetCore.Razor.Tasks.csproj +++ b/src/Razor/Razor.Tasks/src/Microsoft.AspNetCore.Razor.Tasks.csproj @@ -1,4 +1,4 @@ - + Razor is a markup syntax for adding server-side logic to web pages. This assembly contains infrastructure supporting Razor MSBuild integration. @@ -9,23 +9,24 @@ false false + true - - - + + + - + Shared\ServerProtocol\%(FileName) - + Shared\PipeName.cs - + Shared\MutexName.cs - + Shared\Client.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tasks/RazorGenerate.cs b/src/Razor/Razor.Tasks/src/RazorGenerate.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tasks/RazorGenerate.cs rename to src/Razor/Razor.Tasks/src/RazorGenerate.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tasks/RazorTagHelper.cs b/src/Razor/Razor.Tasks/src/RazorTagHelper.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tasks/RazorTagHelper.cs rename to src/Razor/Razor.Tasks/src/RazorTagHelper.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Application.cs b/src/Razor/Razor.Tools/src/Application.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Application.cs rename to src/Razor/Razor.Tools/src/Application.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/CachingMetadataReference.cs b/src/Razor/Razor.Tools/src/CachingMetadataReference.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/CachingMetadataReference.cs rename to src/Razor/Razor.Tools/src/CachingMetadataReference.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Client.cs b/src/Razor/Razor.Tools/src/Client.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Client.cs rename to src/Razor/Razor.Tools/src/Client.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/CommandBase.cs b/src/Razor/Razor.Tools/src/CommandBase.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/CommandBase.cs rename to src/Razor/Razor.Tools/src/CommandBase.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/CompilerHost.cs b/src/Razor/Razor.Tools/src/CompilerHost.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/CompilerHost.cs rename to src/Razor/Razor.Tools/src/CompilerHost.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/CompositeRazorProjectFileSystem.cs b/src/Razor/Razor.Tools/src/CompositeRazorProjectFileSystem.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/CompositeRazorProjectFileSystem.cs rename to src/Razor/Razor.Tools/src/CompositeRazorProjectFileSystem.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ConcurrentLruCache.cs b/src/Razor/Razor.Tools/src/ConcurrentLruCache.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ConcurrentLruCache.cs rename to src/Razor/Razor.Tools/src/ConcurrentLruCache.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Connection.cs b/src/Razor/Razor.Tools/src/Connection.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Connection.cs rename to src/Razor/Razor.Tools/src/Connection.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ConnectionHost.cs b/src/Razor/Razor.Tools/src/ConnectionHost.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ConnectionHost.cs rename to src/Razor/Razor.Tools/src/ConnectionHost.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ConnectionResult.cs b/src/Razor/Razor.Tools/src/ConnectionResult.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ConnectionResult.cs rename to src/Razor/Razor.Tools/src/ConnectionResult.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/DebugMode.cs b/src/Razor/Razor.Tools/src/DebugMode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/DebugMode.cs rename to src/Razor/Razor.Tools/src/DebugMode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/DefaultExtensionAssemblyLoader.cs b/src/Razor/Razor.Tools/src/DefaultExtensionAssemblyLoader.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/DefaultExtensionAssemblyLoader.cs rename to src/Razor/Razor.Tools/src/DefaultExtensionAssemblyLoader.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/DefaultExtensionDependencyChecker.cs b/src/Razor/Razor.Tools/src/DefaultExtensionDependencyChecker.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/DefaultExtensionDependencyChecker.cs rename to src/Razor/Razor.Tools/src/DefaultExtensionDependencyChecker.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/DefaultRequestDispatcher.cs b/src/Razor/Razor.Tools/src/DefaultRequestDispatcher.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/DefaultRequestDispatcher.cs rename to src/Razor/Razor.Tools/src/DefaultRequestDispatcher.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/DiscoverCommand.cs b/src/Razor/Razor.Tools/src/DiscoverCommand.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/DiscoverCommand.cs rename to src/Razor/Razor.Tools/src/DiscoverCommand.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/EventBus.cs b/src/Razor/Razor.Tools/src/EventBus.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/EventBus.cs rename to src/Razor/Razor.Tools/src/EventBus.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ExtensionAssemblyLoader.cs b/src/Razor/Razor.Tools/src/ExtensionAssemblyLoader.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ExtensionAssemblyLoader.cs rename to src/Razor/Razor.Tools/src/ExtensionAssemblyLoader.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ExtensionDependencyChecker.cs b/src/Razor/Razor.Tools/src/ExtensionDependencyChecker.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ExtensionDependencyChecker.cs rename to src/Razor/Razor.Tools/src/ExtensionDependencyChecker.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/GenerateCommand.cs b/src/Razor/Razor.Tools/src/GenerateCommand.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/GenerateCommand.cs rename to src/Razor/Razor.Tools/src/GenerateCommand.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Memory.cs b/src/Razor/Razor.Tools/src/Memory.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Memory.cs rename to src/Razor/Razor.Tools/src/Memory.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/MetadataCache.cs b/src/Razor/Razor.Tools/src/MetadataCache.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/MetadataCache.cs rename to src/Razor/Razor.Tools/src/MetadataCache.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/MetadataReaderExtensions.cs b/src/Razor/Razor.Tools/src/MetadataReaderExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/MetadataReaderExtensions.cs rename to src/Razor/Razor.Tools/src/MetadataReaderExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/MutexName.cs b/src/Razor/Razor.Tools/src/MutexName.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/MutexName.cs rename to src/Razor/Razor.Tools/src/MutexName.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/PipeName.cs b/src/Razor/Razor.Tools/src/PipeName.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/PipeName.cs rename to src/Razor/Razor.Tools/src/PipeName.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Program.cs b/src/Razor/Razor.Tools/src/Program.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Program.cs rename to src/Razor/Razor.Tools/src/Program.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Properties/AssemblyInfo.cs b/src/Razor/Razor.Tools/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Properties/AssemblyInfo.cs rename to src/Razor/Razor.Tools/src/Properties/AssemblyInfo.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/RequestDispatcher.cs b/src/Razor/Razor.Tools/src/RequestDispatcher.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/RequestDispatcher.cs rename to src/Razor/Razor.Tools/src/RequestDispatcher.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerCommand.cs b/src/Razor/Razor.Tools/src/ServerCommand.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerCommand.cs rename to src/Razor/Razor.Tools/src/ServerCommand.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/CompletedServerResponse.cs b/src/Razor/Razor.Tools/src/ServerProtocol/CompletedServerResponse.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/CompletedServerResponse.cs rename to src/Razor/Razor.Tools/src/ServerProtocol/CompletedServerResponse.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/MismatchedVersionServerResponse.cs b/src/Razor/Razor.Tools/src/ServerProtocol/MismatchedVersionServerResponse.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/MismatchedVersionServerResponse.cs rename to src/Razor/Razor.Tools/src/ServerProtocol/MismatchedVersionServerResponse.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/NativeMethods.cs b/src/Razor/Razor.Tools/src/ServerProtocol/NativeMethods.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/NativeMethods.cs rename to src/Razor/Razor.Tools/src/ServerProtocol/NativeMethods.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/RejectedServerResponse.cs b/src/Razor/Razor.Tools/src/ServerProtocol/RejectedServerResponse.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/RejectedServerResponse.cs rename to src/Razor/Razor.Tools/src/ServerProtocol/RejectedServerResponse.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/RequestArgument.cs b/src/Razor/Razor.Tools/src/ServerProtocol/RequestArgument.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/RequestArgument.cs rename to src/Razor/Razor.Tools/src/ServerProtocol/RequestArgument.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/ServerConnection.cs b/src/Razor/Razor.Tools/src/ServerProtocol/ServerConnection.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/ServerConnection.cs rename to src/Razor/Razor.Tools/src/ServerProtocol/ServerConnection.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/ServerLogger.cs b/src/Razor/Razor.Tools/src/ServerProtocol/ServerLogger.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/ServerLogger.cs rename to src/Razor/Razor.Tools/src/ServerProtocol/ServerLogger.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/ServerPaths.cs b/src/Razor/Razor.Tools/src/ServerProtocol/ServerPaths.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/ServerPaths.cs rename to src/Razor/Razor.Tools/src/ServerProtocol/ServerPaths.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/ServerProtocol.cs b/src/Razor/Razor.Tools/src/ServerProtocol/ServerProtocol.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/ServerProtocol.cs rename to src/Razor/Razor.Tools/src/ServerProtocol/ServerProtocol.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/ServerRequest.cs b/src/Razor/Razor.Tools/src/ServerProtocol/ServerRequest.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/ServerRequest.cs rename to src/Razor/Razor.Tools/src/ServerProtocol/ServerRequest.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/ServerResponse.cs b/src/Razor/Razor.Tools/src/ServerProtocol/ServerResponse.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/ServerResponse.cs rename to src/Razor/Razor.Tools/src/ServerProtocol/ServerResponse.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/ShutdownServerResponse.cs b/src/Razor/Razor.Tools/src/ServerProtocol/ShutdownServerResponse.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/ShutdownServerResponse.cs rename to src/Razor/Razor.Tools/src/ServerProtocol/ShutdownServerResponse.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ShadowCopyManager.cs b/src/Razor/Razor.Tools/src/ShadowCopyManager.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ShadowCopyManager.cs rename to src/Razor/Razor.Tools/src/ShadowCopyManager.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Shared/RazorDiagnosticJsonConverter.cs b/src/Razor/Razor.Tools/src/Shared/RazorDiagnosticJsonConverter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Shared/RazorDiagnosticJsonConverter.cs rename to src/Razor/Razor.Tools/src/Shared/RazorDiagnosticJsonConverter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Shared/TagHelperDescriptorJsonConverter.cs b/src/Razor/Razor.Tools/src/Shared/TagHelperDescriptorJsonConverter.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Shared/TagHelperDescriptorJsonConverter.cs rename to src/Razor/Razor.Tools/src/Shared/TagHelperDescriptorJsonConverter.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ShutdownCommand.cs b/src/Razor/Razor.Tools/src/ShutdownCommand.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ShutdownCommand.cs rename to src/Razor/Razor.Tools/src/ShutdownCommand.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Microsoft.AspNetCore.Razor.Tools.csproj b/src/Razor/Razor.Tools/src/rzc.csproj similarity index 74% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Microsoft.AspNetCore.Razor.Tools.csproj rename to src/Razor/Razor.Tools/src/rzc.csproj index 8e48f98549e1..df615b2cb700 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Microsoft.AspNetCore.Razor.Tools.csproj +++ b/src/Razor/Razor.Tools/src/rzc.csproj @@ -10,15 +10,15 @@ false false + true + true + false - - - - - - + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/CompositeRazorProjectFileSystemTest.cs b/src/Razor/Razor.Tools/test/CompositeRazorProjectFileSystemTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/CompositeRazorProjectFileSystemTest.cs rename to src/Razor/Razor.Tools/test/CompositeRazorProjectFileSystemTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/ConcurrentLruCacheTest.cs b/src/Razor/Razor.Tools/test/ConcurrentLruCacheTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/ConcurrentLruCacheTest.cs rename to src/Razor/Razor.Tools/test/ConcurrentLruCacheTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/DefaultExtensionAssemblyLoaderTest.cs b/src/Razor/Razor.Tools/test/DefaultExtensionAssemblyLoaderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/DefaultExtensionAssemblyLoaderTest.cs rename to src/Razor/Razor.Tools/test/DefaultExtensionAssemblyLoaderTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/DefaultExtensionDependencyCheckerTest.cs b/src/Razor/Razor.Tools/test/DefaultExtensionDependencyCheckerTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/DefaultExtensionDependencyCheckerTest.cs rename to src/Razor/Razor.Tools/test/DefaultExtensionDependencyCheckerTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/DefaultRequestDispatcherTest.cs b/src/Razor/Razor.Tools/test/DefaultRequestDispatcherTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/DefaultRequestDispatcherTest.cs rename to src/Razor/Razor.Tools/test/DefaultRequestDispatcherTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Infrastructure/ServerData.cs b/src/Razor/Razor.Tools/test/Infrastructure/ServerData.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Infrastructure/ServerData.cs rename to src/Razor/Razor.Tools/test/Infrastructure/ServerData.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Infrastructure/ServerStats.cs b/src/Razor/Razor.Tools/test/Infrastructure/ServerStats.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Infrastructure/ServerStats.cs rename to src/Razor/Razor.Tools/test/Infrastructure/ServerStats.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Infrastructure/ServerUtilities.cs b/src/Razor/Razor.Tools/test/Infrastructure/ServerUtilities.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Infrastructure/ServerUtilities.cs rename to src/Razor/Razor.Tools/test/Infrastructure/ServerUtilities.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Infrastructure/TestableEventBus.cs b/src/Razor/Razor.Tools/test/Infrastructure/TestableEventBus.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Infrastructure/TestableEventBus.cs rename to src/Razor/Razor.Tools/test/Infrastructure/TestableEventBus.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/LoaderTestResources.cs b/src/Razor/Razor.Tools/test/LoaderTestResources.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/LoaderTestResources.cs rename to src/Razor/Razor.Tools/test/LoaderTestResources.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/MetadataCacheTest.cs b/src/Razor/Razor.Tools/test/MetadataCacheTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/MetadataCacheTest.cs rename to src/Razor/Razor.Tools/test/MetadataCacheTest.cs diff --git a/src/Razor/Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj b/src/Razor/Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj new file mode 100644 index 000000000000..f4894d2d7d45 --- /dev/null +++ b/src/Razor/Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj @@ -0,0 +1,12 @@ + + + + netcoreapp2.1 + + + + + + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Properties/AssemblyInfo.cs b/src/Razor/Razor.Tools/test/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Properties/AssemblyInfo.cs rename to src/Razor/Razor.Tools/test/Properties/AssemblyInfo.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/ServerCommandTest.cs b/src/Razor/Razor.Tools/test/ServerCommandTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/ServerCommandTest.cs rename to src/Razor/Razor.Tools/test/ServerCommandTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/ServerLifecycleTest.cs b/src/Razor/Razor.Tools/test/ServerLifecycleTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/ServerLifecycleTest.cs rename to src/Razor/Razor.Tools/test/ServerLifecycleTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/ServerProtocol/ServerProtocolTest.cs b/src/Razor/Razor.Tools/test/ServerProtocol/ServerProtocolTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/ServerProtocol/ServerProtocolTest.cs rename to src/Razor/Razor.Tools/test/ServerProtocol/ServerProtocolTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/TempDirectory.cs b/src/Razor/Razor.Tools/test/TempDirectory.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/TempDirectory.cs rename to src/Razor/Razor.Tools/test/TempDirectory.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/TestDefaultExtensionAssemblyLoader.cs b/src/Razor/Razor.Tools/test/TestDefaultExtensionAssemblyLoader.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/TestDefaultExtensionAssemblyLoader.cs rename to src/Razor/Razor.Tools/test/TestDefaultExtensionAssemblyLoader.cs diff --git a/src/Razor/Razor.sln b/src/Razor/Razor.sln index 7fa54f113ffc..c188fb83cb1b 100644 --- a/src/Razor/Razor.sln +++ b/src/Razor/Razor.sln @@ -1,303 +1,216 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27130.2036 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3C0D6505-79B3-49D0-B4C3-176F0F1836ED}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Razor", "Razor", "{FD09AA4B-FD90-4B88-8E74-77FBF96AFF07}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{92463391-81BE-462B-AC3C-78C6C760741F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor", "Razor\src\Microsoft.AspNetCore.Razor.csproj", "{50B155AF-6778-4FBF-AF97-0AD3DFF11564}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor", "src\Microsoft.AspNetCore.Razor\Microsoft.AspNetCore.Razor.csproj", "{EDA30434-C567-44DC-B8B6-2566A7F77163}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test", "Razor\test\Microsoft.AspNetCore.Razor.Test.csproj", "{6F476A56-25E8-4BDC-82D5-4EBA01D93765}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj", "{D0196096-1B01-4133-AACE-1A10A0F7247C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Razor.Design", "Razor.Design", "{0E2AC9F5-F32F-457E-A166-8CA3DF684EED}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F8C12DD6-659D-405A-AA27-FB22AD92A010}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - build\dependencies.props = build\dependencies.props - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - build\sources.props = build\sources.props - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Design", "Razor.Design\src\Microsoft.AspNetCore.Razor.Design.csproj", "{D985E2C4-855B-4E62-AEC1-AD97F04BBA28}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPageGenerator", "src\RazorPageGenerator\RazorPageGenerator.csproj", "{7BE58880-36AD-4CD5-9E16-2A5AFEA790EF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Design.Test", "Razor.Design\test\IntegrationTests\Microsoft.AspNetCore.Razor.Design.Test.csproj", "{F4446B51-F445-438B-89EC-DC435BE261DC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Language", "src\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj", "{932F3C9C-A6C0-40D3-BA50-9309886242FC}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Razor.Language", "Razor.Language", "{8DA7B398-7C2C-45D7-8DDE-A0A0C4FA2EB6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Language.Test", "test\Microsoft.AspNetCore.Razor.Language.Test\Microsoft.AspNetCore.Razor.Language.Test.csproj", "{969357A4-CCF1-46D9-B002-9AA072AFC75C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Language", "Razor.Language\src\Microsoft.AspNetCore.Razor.Language.csproj", "{EF471648-363D-49CD-804A-C4B97F654ED4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime.Test", "test\Microsoft.AspNetCore.Razor.Runtime.Test\Microsoft.AspNetCore.Razor.Runtime.Test.csproj", "{277AB67E-9C8D-4799-A18C-C628E70A8664}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Language.Test", "Razor.Language\test\Microsoft.AspNetCore.Razor.Language.Test.csproj", "{EAD32BF5-129C-44B9-994D-FCC10CF05C57}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Razor", "src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj", "{42403DAF-F0BC-4F3A-B7F2-46D7013345D8}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Razor.Runtime", "Razor.Runtime", "{499B3A3F-B718-4176-ABF0-C0B083E406C0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Razor.Test", "test\Microsoft.CodeAnalysis.Razor.Test\Microsoft.CodeAnalysis.Razor.Test.csproj", "{7A8A1664-37CE-4376-81CA-1862CF5F91D9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj", "{C375FC3D-0066-47E4-83AB-9537029FAD04}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPageGenerator.Test", "test\RazorPageGenerator.Test\RazorPageGenerator.Test.csproj", "{96EB1BD4-B8E0-4F52-A068-BBCACA7E3F63}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime.Test", "Razor.Runtime\test\Microsoft.AspNetCore.Razor.Runtime.Test.csproj", "{E396C744-BFD5-459C-8E83-91A902E4039A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Extensions", "src\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj", "{995F2FEB-65FA-4399-B1C0-16E0B3FBDB15}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Razor.Tasks", "Razor.Tasks", "{339C0D30-DB7D-49AE-BFBC-5F61AAD410BA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Test", "test\Microsoft.AspNetCore.Mvc.Razor.Extensions.Test\Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj", "{7CFD5646-A757-4498-9E01-9C8528ED60AE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Tasks", "Razor.Tasks\src\Microsoft.AspNetCore.Razor.Tasks.csproj", "{55A97BE6-70D3-4C33-9B47-72F57272AF14}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test.Common", "test\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj", "{078AEF36-F319-4CE2-BAA2-5B58A6536B46}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Razor.Tools", "Razor.Tools", "{1DDAB6E2-F2B2-45E6-99AF-EC113C591F93}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test.MvcShim", "test\Microsoft.AspNetCore.Razor.Test.MvcShim\Microsoft.AspNetCore.Razor.Test.MvcShim.csproj", "{8F165A3F-A18C-4649-AA08-C0E1BA5F5C90}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Tools.Test", "Razor.Tools\test\Microsoft.AspNetCore.Razor.Tools.Test.csproj", "{796399C5-702B-44F8-81FF-A528B6057442}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X", "src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj", "{F1538809-7347-45D2-A7AC-C1D89CF0BBD4}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RazorPageGenerator", "RazorPageGenerator", "{7527A78F-3DFC-4490-8D3F-F57C0B0019E0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test", "test\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj", "{296D4516-0323-4D28-955D-B0324E4F10BE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPageGenerator.Test", "RazorPageGenerator\test\RazorPageGenerator.Test.csproj", "{D321AA23-31CC-4B60-A025-7A318EE02734}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X", "test\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj", "{AC5CA24B-B81E-4B20-B193-2E3983B1896C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sdk.Razor", "Sdk.Razor", "{58E57F6D-A14F-4EA2-8D3F-557EC7792BEE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Design", "src\Microsoft.AspNetCore.Razor.Design\Microsoft.AspNetCore.Razor.Design.csproj", "{5257B25D-330A-4DCF-ACED-B4709CFBF916}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Razor", "Sdk.Razor\src\Microsoft.NET.Sdk.Razor.csproj", "{0C0B97F2-E388-474E-9C03-BD1F3F7AAAC4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Design.Test", "test\Microsoft.AspNetCore.Razor.Design.Test\Microsoft.AspNetCore.Razor.Design.Test.csproj", "{1D90F276-E1CA-4FDF-A173-EB889E7D3150}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeAnalysis.Razor", "CodeAnalysis.Razor", "{17CF4134-3941-4379-9A6D-1F86643CB7E0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Tasks", "src\Microsoft.AspNetCore.Razor.Tasks\Microsoft.AspNetCore.Razor.Tasks.csproj", "{043B9497-C0BA-4770-9210-4456D2F81CE0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Razor", "CodeAnalysis.Razor\src\Microsoft.CodeAnalysis.Razor.csproj", "{626AE302-6C1F-4A48-B78A-B50F97443A50}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test", "test\Microsoft.AspNetCore.Razor.Test\Microsoft.AspNetCore.Razor.Test.csproj", "{323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Razor.Test", "CodeAnalysis.Razor\test\Microsoft.CodeAnalysis.Razor.Test.csproj", "{53B7C33F-2DA2-45C3-8956-DD425496B33F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Tools", "src\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj", "{3E7F2D49-3B45-45A8-9893-F73EC1EEBAAB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Razor.Extensions", "Mvc.Razor.Extensions", "{AB5A79CC-234D-421F-A1EB-CAE5DF4CB65D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Razor", "src\Microsoft.NET.Sdk.Razor\Microsoft.NET.Sdk.Razor.csproj", "{7D9ECCEE-71D1-4A42-ABEE-876AFA1B4FC9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Extensions", "Mvc.Razor.Extensions\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj", "{6C544D1D-E6F0-49E1-999B-91C7B5EA0319}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Tools.Test", "test\Microsoft.AspNetCore.Razor.Tools.Test\Microsoft.AspNetCore.Razor.Tools.Test.csproj", "{6EA56B2B-89EC-4C38-A384-97D203375B06}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Test", "Mvc.Razor.Extensions\test\Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj", "{A1933DF0-875D-4483-93C8-1D39C804BCBD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib", "test\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj", "{72E89155-86C7-454E-BDD9-39F497F2F61B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Razor.Extensions.Version1_X", "Mvc.Razor.Extensions.Version1_X", "{B9A66356-EA7D-4BA6-BF1C-1174C7B2FD10}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X", "Mvc.Razor.Extensions.Version1_X\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj", "{7A197564-75FD-4A4C-B3AB-79D9B1A8C65E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test", "Mvc.Razor.Extensions.Version1_X\test\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj", "{7476A912-974B-457C-8700-1101EF35CC91}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{22783456-A0CF-45B7-84B1-E25F647909A5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{13B4F1CC-4632-41C3-9675-6824F6C8AEB4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test.Common", "test\testassets\Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj", "{C6E4BEDB-9632-411E-A6B1-A4F6A88E8AAD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test.MvcShim", "test\testassets\Razor.Test.MvcShim\Microsoft.AspNetCore.Razor.Test.MvcShim.csproj", "{A85AF698-6E66-434B-BBA8-D638C22C71B3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib", "test\testassets\Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj", "{B0632FF5-04FE-4278-9236-3BDE567ACFCA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X", "test\testassets\Razor.Test.MvcShim.Version1_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj", "{2D4C6E24-19FD-4BA7-BF8D-BAD2775F9F7D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "rzc", "Razor.Tools\src\rzc.csproj", "{B38452AC-1AFF-40E4-8AD3-C137B8548379}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-razorpagegenerator", "RazorPageGenerator\src\dotnet-razorpagegenerator.csproj", "{913855F0-933B-4FA3-A535-F149F7DF4959}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - DebugNoVSIX|Any CPU = DebugNoVSIX|Any CPU Release|Any CPU = Release|Any CPU - ReleaseNoVSIX|Any CPU = ReleaseNoVSIX|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EDA30434-C567-44DC-B8B6-2566A7F77163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EDA30434-C567-44DC-B8B6-2566A7F77163}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EDA30434-C567-44DC-B8B6-2566A7F77163}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {EDA30434-C567-44DC-B8B6-2566A7F77163}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {EDA30434-C567-44DC-B8B6-2566A7F77163}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EDA30434-C567-44DC-B8B6-2566A7F77163}.Release|Any CPU.Build.0 = Release|Any CPU - {EDA30434-C567-44DC-B8B6-2566A7F77163}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {EDA30434-C567-44DC-B8B6-2566A7F77163}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.Release|Any CPU.Build.0 = Release|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {7BE58880-36AD-4CD5-9E16-2A5AFEA790EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BE58880-36AD-4CD5-9E16-2A5AFEA790EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BE58880-36AD-4CD5-9E16-2A5AFEA790EF}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {7BE58880-36AD-4CD5-9E16-2A5AFEA790EF}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {7BE58880-36AD-4CD5-9E16-2A5AFEA790EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BE58880-36AD-4CD5-9E16-2A5AFEA790EF}.Release|Any CPU.Build.0 = Release|Any CPU - {7BE58880-36AD-4CD5-9E16-2A5AFEA790EF}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {7BE58880-36AD-4CD5-9E16-2A5AFEA790EF}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {932F3C9C-A6C0-40D3-BA50-9309886242FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {932F3C9C-A6C0-40D3-BA50-9309886242FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {932F3C9C-A6C0-40D3-BA50-9309886242FC}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {932F3C9C-A6C0-40D3-BA50-9309886242FC}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {932F3C9C-A6C0-40D3-BA50-9309886242FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {932F3C9C-A6C0-40D3-BA50-9309886242FC}.Release|Any CPU.Build.0 = Release|Any CPU - {932F3C9C-A6C0-40D3-BA50-9309886242FC}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {932F3C9C-A6C0-40D3-BA50-9309886242FC}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {969357A4-CCF1-46D9-B002-9AA072AFC75C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {969357A4-CCF1-46D9-B002-9AA072AFC75C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {969357A4-CCF1-46D9-B002-9AA072AFC75C}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {969357A4-CCF1-46D9-B002-9AA072AFC75C}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {969357A4-CCF1-46D9-B002-9AA072AFC75C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {969357A4-CCF1-46D9-B002-9AA072AFC75C}.Release|Any CPU.Build.0 = Release|Any CPU - {969357A4-CCF1-46D9-B002-9AA072AFC75C}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {969357A4-CCF1-46D9-B002-9AA072AFC75C}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.Debug|Any CPU.Build.0 = Debug|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.Release|Any CPU.ActiveCfg = Release|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.Release|Any CPU.Build.0 = Release|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {42403DAF-F0BC-4F3A-B7F2-46D7013345D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42403DAF-F0BC-4F3A-B7F2-46D7013345D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42403DAF-F0BC-4F3A-B7F2-46D7013345D8}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {42403DAF-F0BC-4F3A-B7F2-46D7013345D8}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {42403DAF-F0BC-4F3A-B7F2-46D7013345D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42403DAF-F0BC-4F3A-B7F2-46D7013345D8}.Release|Any CPU.Build.0 = Release|Any CPU - {42403DAF-F0BC-4F3A-B7F2-46D7013345D8}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {42403DAF-F0BC-4F3A-B7F2-46D7013345D8}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {7A8A1664-37CE-4376-81CA-1862CF5F91D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A8A1664-37CE-4376-81CA-1862CF5F91D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A8A1664-37CE-4376-81CA-1862CF5F91D9}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {7A8A1664-37CE-4376-81CA-1862CF5F91D9}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {7A8A1664-37CE-4376-81CA-1862CF5F91D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A8A1664-37CE-4376-81CA-1862CF5F91D9}.Release|Any CPU.Build.0 = Release|Any CPU - {7A8A1664-37CE-4376-81CA-1862CF5F91D9}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {7A8A1664-37CE-4376-81CA-1862CF5F91D9}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {96EB1BD4-B8E0-4F52-A068-BBCACA7E3F63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96EB1BD4-B8E0-4F52-A068-BBCACA7E3F63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96EB1BD4-B8E0-4F52-A068-BBCACA7E3F63}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {96EB1BD4-B8E0-4F52-A068-BBCACA7E3F63}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {96EB1BD4-B8E0-4F52-A068-BBCACA7E3F63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96EB1BD4-B8E0-4F52-A068-BBCACA7E3F63}.Release|Any CPU.Build.0 = Release|Any CPU - {96EB1BD4-B8E0-4F52-A068-BBCACA7E3F63}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {96EB1BD4-B8E0-4F52-A068-BBCACA7E3F63}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {995F2FEB-65FA-4399-B1C0-16E0B3FBDB15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {995F2FEB-65FA-4399-B1C0-16E0B3FBDB15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {995F2FEB-65FA-4399-B1C0-16E0B3FBDB15}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {995F2FEB-65FA-4399-B1C0-16E0B3FBDB15}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {995F2FEB-65FA-4399-B1C0-16E0B3FBDB15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {995F2FEB-65FA-4399-B1C0-16E0B3FBDB15}.Release|Any CPU.Build.0 = Release|Any CPU - {995F2FEB-65FA-4399-B1C0-16E0B3FBDB15}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {995F2FEB-65FA-4399-B1C0-16E0B3FBDB15}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {7CFD5646-A757-4498-9E01-9C8528ED60AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CFD5646-A757-4498-9E01-9C8528ED60AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CFD5646-A757-4498-9E01-9C8528ED60AE}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {7CFD5646-A757-4498-9E01-9C8528ED60AE}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {7CFD5646-A757-4498-9E01-9C8528ED60AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CFD5646-A757-4498-9E01-9C8528ED60AE}.Release|Any CPU.Build.0 = Release|Any CPU - {7CFD5646-A757-4498-9E01-9C8528ED60AE}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {7CFD5646-A757-4498-9E01-9C8528ED60AE}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {078AEF36-F319-4CE2-BAA2-5B58A6536B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {078AEF36-F319-4CE2-BAA2-5B58A6536B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {078AEF36-F319-4CE2-BAA2-5B58A6536B46}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {078AEF36-F319-4CE2-BAA2-5B58A6536B46}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {078AEF36-F319-4CE2-BAA2-5B58A6536B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {078AEF36-F319-4CE2-BAA2-5B58A6536B46}.Release|Any CPU.Build.0 = Release|Any CPU - {078AEF36-F319-4CE2-BAA2-5B58A6536B46}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {078AEF36-F319-4CE2-BAA2-5B58A6536B46}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {8F165A3F-A18C-4649-AA08-C0E1BA5F5C90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F165A3F-A18C-4649-AA08-C0E1BA5F5C90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F165A3F-A18C-4649-AA08-C0E1BA5F5C90}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {8F165A3F-A18C-4649-AA08-C0E1BA5F5C90}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {8F165A3F-A18C-4649-AA08-C0E1BA5F5C90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F165A3F-A18C-4649-AA08-C0E1BA5F5C90}.Release|Any CPU.Build.0 = Release|Any CPU - {8F165A3F-A18C-4649-AA08-C0E1BA5F5C90}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {8F165A3F-A18C-4649-AA08-C0E1BA5F5C90}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {F1538809-7347-45D2-A7AC-C1D89CF0BBD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1538809-7347-45D2-A7AC-C1D89CF0BBD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1538809-7347-45D2-A7AC-C1D89CF0BBD4}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {F1538809-7347-45D2-A7AC-C1D89CF0BBD4}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {F1538809-7347-45D2-A7AC-C1D89CF0BBD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1538809-7347-45D2-A7AC-C1D89CF0BBD4}.Release|Any CPU.Build.0 = Release|Any CPU - {F1538809-7347-45D2-A7AC-C1D89CF0BBD4}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {F1538809-7347-45D2-A7AC-C1D89CF0BBD4}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {296D4516-0323-4D28-955D-B0324E4F10BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {296D4516-0323-4D28-955D-B0324E4F10BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {296D4516-0323-4D28-955D-B0324E4F10BE}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {296D4516-0323-4D28-955D-B0324E4F10BE}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {296D4516-0323-4D28-955D-B0324E4F10BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {296D4516-0323-4D28-955D-B0324E4F10BE}.Release|Any CPU.Build.0 = Release|Any CPU - {296D4516-0323-4D28-955D-B0324E4F10BE}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {296D4516-0323-4D28-955D-B0324E4F10BE}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {AC5CA24B-B81E-4B20-B193-2E3983B1896C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC5CA24B-B81E-4B20-B193-2E3983B1896C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC5CA24B-B81E-4B20-B193-2E3983B1896C}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {AC5CA24B-B81E-4B20-B193-2E3983B1896C}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {AC5CA24B-B81E-4B20-B193-2E3983B1896C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC5CA24B-B81E-4B20-B193-2E3983B1896C}.Release|Any CPU.Build.0 = Release|Any CPU - {AC5CA24B-B81E-4B20-B193-2E3983B1896C}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {AC5CA24B-B81E-4B20-B193-2E3983B1896C}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {5257B25D-330A-4DCF-ACED-B4709CFBF916}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5257B25D-330A-4DCF-ACED-B4709CFBF916}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5257B25D-330A-4DCF-ACED-B4709CFBF916}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {5257B25D-330A-4DCF-ACED-B4709CFBF916}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {5257B25D-330A-4DCF-ACED-B4709CFBF916}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5257B25D-330A-4DCF-ACED-B4709CFBF916}.Release|Any CPU.Build.0 = Release|Any CPU - {5257B25D-330A-4DCF-ACED-B4709CFBF916}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {5257B25D-330A-4DCF-ACED-B4709CFBF916}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {1D90F276-E1CA-4FDF-A173-EB889E7D3150}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D90F276-E1CA-4FDF-A173-EB889E7D3150}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D90F276-E1CA-4FDF-A173-EB889E7D3150}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {1D90F276-E1CA-4FDF-A173-EB889E7D3150}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {1D90F276-E1CA-4FDF-A173-EB889E7D3150}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D90F276-E1CA-4FDF-A173-EB889E7D3150}.Release|Any CPU.Build.0 = Release|Any CPU - {1D90F276-E1CA-4FDF-A173-EB889E7D3150}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {1D90F276-E1CA-4FDF-A173-EB889E7D3150}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {043B9497-C0BA-4770-9210-4456D2F81CE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {043B9497-C0BA-4770-9210-4456D2F81CE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {043B9497-C0BA-4770-9210-4456D2F81CE0}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {043B9497-C0BA-4770-9210-4456D2F81CE0}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {043B9497-C0BA-4770-9210-4456D2F81CE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {043B9497-C0BA-4770-9210-4456D2F81CE0}.Release|Any CPU.Build.0 = Release|Any CPU - {043B9497-C0BA-4770-9210-4456D2F81CE0}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {043B9497-C0BA-4770-9210-4456D2F81CE0}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.Release|Any CPU.Build.0 = Release|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {3E7F2D49-3B45-45A8-9893-F73EC1EEBAAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E7F2D49-3B45-45A8-9893-F73EC1EEBAAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E7F2D49-3B45-45A8-9893-F73EC1EEBAAB}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {3E7F2D49-3B45-45A8-9893-F73EC1EEBAAB}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {3E7F2D49-3B45-45A8-9893-F73EC1EEBAAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E7F2D49-3B45-45A8-9893-F73EC1EEBAAB}.Release|Any CPU.Build.0 = Release|Any CPU - {3E7F2D49-3B45-45A8-9893-F73EC1EEBAAB}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {3E7F2D49-3B45-45A8-9893-F73EC1EEBAAB}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {7D9ECCEE-71D1-4A42-ABEE-876AFA1B4FC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D9ECCEE-71D1-4A42-ABEE-876AFA1B4FC9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D9ECCEE-71D1-4A42-ABEE-876AFA1B4FC9}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {7D9ECCEE-71D1-4A42-ABEE-876AFA1B4FC9}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {7D9ECCEE-71D1-4A42-ABEE-876AFA1B4FC9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D9ECCEE-71D1-4A42-ABEE-876AFA1B4FC9}.Release|Any CPU.Build.0 = Release|Any CPU - {7D9ECCEE-71D1-4A42-ABEE-876AFA1B4FC9}.ReleaseNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {7D9ECCEE-71D1-4A42-ABEE-876AFA1B4FC9}.ReleaseNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {6EA56B2B-89EC-4C38-A384-97D203375B06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EA56B2B-89EC-4C38-A384-97D203375B06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EA56B2B-89EC-4C38-A384-97D203375B06}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {6EA56B2B-89EC-4C38-A384-97D203375B06}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {6EA56B2B-89EC-4C38-A384-97D203375B06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EA56B2B-89EC-4C38-A384-97D203375B06}.Release|Any CPU.Build.0 = Release|Any CPU - {6EA56B2B-89EC-4C38-A384-97D203375B06}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {6EA56B2B-89EC-4C38-A384-97D203375B06}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {72E89155-86C7-454E-BDD9-39F497F2F61B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72E89155-86C7-454E-BDD9-39F497F2F61B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72E89155-86C7-454E-BDD9-39F497F2F61B}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {72E89155-86C7-454E-BDD9-39F497F2F61B}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {72E89155-86C7-454E-BDD9-39F497F2F61B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72E89155-86C7-454E-BDD9-39F497F2F61B}.Release|Any CPU.Build.0 = Release|Any CPU - {72E89155-86C7-454E-BDD9-39F497F2F61B}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {72E89155-86C7-454E-BDD9-39F497F2F61B}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU + {50B155AF-6778-4FBF-AF97-0AD3DFF11564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50B155AF-6778-4FBF-AF97-0AD3DFF11564}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50B155AF-6778-4FBF-AF97-0AD3DFF11564}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50B155AF-6778-4FBF-AF97-0AD3DFF11564}.Release|Any CPU.Build.0 = Release|Any CPU + {6F476A56-25E8-4BDC-82D5-4EBA01D93765}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6F476A56-25E8-4BDC-82D5-4EBA01D93765}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6F476A56-25E8-4BDC-82D5-4EBA01D93765}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6F476A56-25E8-4BDC-82D5-4EBA01D93765}.Release|Any CPU.Build.0 = Release|Any CPU + {D985E2C4-855B-4E62-AEC1-AD97F04BBA28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D985E2C4-855B-4E62-AEC1-AD97F04BBA28}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D985E2C4-855B-4E62-AEC1-AD97F04BBA28}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D985E2C4-855B-4E62-AEC1-AD97F04BBA28}.Release|Any CPU.Build.0 = Release|Any CPU + {F4446B51-F445-438B-89EC-DC435BE261DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F4446B51-F445-438B-89EC-DC435BE261DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F4446B51-F445-438B-89EC-DC435BE261DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F4446B51-F445-438B-89EC-DC435BE261DC}.Release|Any CPU.Build.0 = Release|Any CPU + {EF471648-363D-49CD-804A-C4B97F654ED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EF471648-363D-49CD-804A-C4B97F654ED4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EF471648-363D-49CD-804A-C4B97F654ED4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EF471648-363D-49CD-804A-C4B97F654ED4}.Release|Any CPU.Build.0 = Release|Any CPU + {EAD32BF5-129C-44B9-994D-FCC10CF05C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EAD32BF5-129C-44B9-994D-FCC10CF05C57}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EAD32BF5-129C-44B9-994D-FCC10CF05C57}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EAD32BF5-129C-44B9-994D-FCC10CF05C57}.Release|Any CPU.Build.0 = Release|Any CPU + {C375FC3D-0066-47E4-83AB-9537029FAD04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C375FC3D-0066-47E4-83AB-9537029FAD04}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C375FC3D-0066-47E4-83AB-9537029FAD04}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C375FC3D-0066-47E4-83AB-9537029FAD04}.Release|Any CPU.Build.0 = Release|Any CPU + {E396C744-BFD5-459C-8E83-91A902E4039A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E396C744-BFD5-459C-8E83-91A902E4039A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E396C744-BFD5-459C-8E83-91A902E4039A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E396C744-BFD5-459C-8E83-91A902E4039A}.Release|Any CPU.Build.0 = Release|Any CPU + {55A97BE6-70D3-4C33-9B47-72F57272AF14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {55A97BE6-70D3-4C33-9B47-72F57272AF14}.Debug|Any CPU.Build.0 = Debug|Any CPU + {55A97BE6-70D3-4C33-9B47-72F57272AF14}.Release|Any CPU.ActiveCfg = Release|Any CPU + {55A97BE6-70D3-4C33-9B47-72F57272AF14}.Release|Any CPU.Build.0 = Release|Any CPU + {796399C5-702B-44F8-81FF-A528B6057442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {796399C5-702B-44F8-81FF-A528B6057442}.Debug|Any CPU.Build.0 = Debug|Any CPU + {796399C5-702B-44F8-81FF-A528B6057442}.Release|Any CPU.ActiveCfg = Release|Any CPU + {796399C5-702B-44F8-81FF-A528B6057442}.Release|Any CPU.Build.0 = Release|Any CPU + {D321AA23-31CC-4B60-A025-7A318EE02734}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D321AA23-31CC-4B60-A025-7A318EE02734}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D321AA23-31CC-4B60-A025-7A318EE02734}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D321AA23-31CC-4B60-A025-7A318EE02734}.Release|Any CPU.Build.0 = Release|Any CPU + {0C0B97F2-E388-474E-9C03-BD1F3F7AAAC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0C0B97F2-E388-474E-9C03-BD1F3F7AAAC4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0C0B97F2-E388-474E-9C03-BD1F3F7AAAC4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0C0B97F2-E388-474E-9C03-BD1F3F7AAAC4}.Release|Any CPU.Build.0 = Release|Any CPU + {626AE302-6C1F-4A48-B78A-B50F97443A50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {626AE302-6C1F-4A48-B78A-B50F97443A50}.Debug|Any CPU.Build.0 = Debug|Any CPU + {626AE302-6C1F-4A48-B78A-B50F97443A50}.Release|Any CPU.ActiveCfg = Release|Any CPU + {626AE302-6C1F-4A48-B78A-B50F97443A50}.Release|Any CPU.Build.0 = Release|Any CPU + {53B7C33F-2DA2-45C3-8956-DD425496B33F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {53B7C33F-2DA2-45C3-8956-DD425496B33F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {53B7C33F-2DA2-45C3-8956-DD425496B33F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {53B7C33F-2DA2-45C3-8956-DD425496B33F}.Release|Any CPU.Build.0 = Release|Any CPU + {6C544D1D-E6F0-49E1-999B-91C7B5EA0319}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6C544D1D-E6F0-49E1-999B-91C7B5EA0319}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6C544D1D-E6F0-49E1-999B-91C7B5EA0319}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6C544D1D-E6F0-49E1-999B-91C7B5EA0319}.Release|Any CPU.Build.0 = Release|Any CPU + {A1933DF0-875D-4483-93C8-1D39C804BCBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A1933DF0-875D-4483-93C8-1D39C804BCBD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A1933DF0-875D-4483-93C8-1D39C804BCBD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A1933DF0-875D-4483-93C8-1D39C804BCBD}.Release|Any CPU.Build.0 = Release|Any CPU + {7A197564-75FD-4A4C-B3AB-79D9B1A8C65E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7A197564-75FD-4A4C-B3AB-79D9B1A8C65E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7A197564-75FD-4A4C-B3AB-79D9B1A8C65E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7A197564-75FD-4A4C-B3AB-79D9B1A8C65E}.Release|Any CPU.Build.0 = Release|Any CPU + {7476A912-974B-457C-8700-1101EF35CC91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7476A912-974B-457C-8700-1101EF35CC91}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7476A912-974B-457C-8700-1101EF35CC91}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7476A912-974B-457C-8700-1101EF35CC91}.Release|Any CPU.Build.0 = Release|Any CPU + {C6E4BEDB-9632-411E-A6B1-A4F6A88E8AAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C6E4BEDB-9632-411E-A6B1-A4F6A88E8AAD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C6E4BEDB-9632-411E-A6B1-A4F6A88E8AAD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C6E4BEDB-9632-411E-A6B1-A4F6A88E8AAD}.Release|Any CPU.Build.0 = Release|Any CPU + {A85AF698-6E66-434B-BBA8-D638C22C71B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A85AF698-6E66-434B-BBA8-D638C22C71B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A85AF698-6E66-434B-BBA8-D638C22C71B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A85AF698-6E66-434B-BBA8-D638C22C71B3}.Release|Any CPU.Build.0 = Release|Any CPU + {B0632FF5-04FE-4278-9236-3BDE567ACFCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0632FF5-04FE-4278-9236-3BDE567ACFCA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0632FF5-04FE-4278-9236-3BDE567ACFCA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0632FF5-04FE-4278-9236-3BDE567ACFCA}.Release|Any CPU.Build.0 = Release|Any CPU + {2D4C6E24-19FD-4BA7-BF8D-BAD2775F9F7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2D4C6E24-19FD-4BA7-BF8D-BAD2775F9F7D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2D4C6E24-19FD-4BA7-BF8D-BAD2775F9F7D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2D4C6E24-19FD-4BA7-BF8D-BAD2775F9F7D}.Release|Any CPU.Build.0 = Release|Any CPU + {B38452AC-1AFF-40E4-8AD3-C137B8548379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B38452AC-1AFF-40E4-8AD3-C137B8548379}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B38452AC-1AFF-40E4-8AD3-C137B8548379}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B38452AC-1AFF-40E4-8AD3-C137B8548379}.Release|Any CPU.Build.0 = Release|Any CPU + {913855F0-933B-4FA3-A535-F149F7DF4959}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {913855F0-933B-4FA3-A535-F149F7DF4959}.Debug|Any CPU.Build.0 = Debug|Any CPU + {913855F0-933B-4FA3-A535-F149F7DF4959}.Release|Any CPU.ActiveCfg = Release|Any CPU + {913855F0-933B-4FA3-A535-F149F7DF4959}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {EDA30434-C567-44DC-B8B6-2566A7F77163} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} - {D0196096-1B01-4133-AACE-1A10A0F7247C} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} - {7BE58880-36AD-4CD5-9E16-2A5AFEA790EF} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} - {932F3C9C-A6C0-40D3-BA50-9309886242FC} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} - {969357A4-CCF1-46D9-B002-9AA072AFC75C} = {92463391-81BE-462B-AC3C-78C6C760741F} - {277AB67E-9C8D-4799-A18C-C628E70A8664} = {92463391-81BE-462B-AC3C-78C6C760741F} - {42403DAF-F0BC-4F3A-B7F2-46D7013345D8} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} - {7A8A1664-37CE-4376-81CA-1862CF5F91D9} = {92463391-81BE-462B-AC3C-78C6C760741F} - {96EB1BD4-B8E0-4F52-A068-BBCACA7E3F63} = {92463391-81BE-462B-AC3C-78C6C760741F} - {995F2FEB-65FA-4399-B1C0-16E0B3FBDB15} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} - {7CFD5646-A757-4498-9E01-9C8528ED60AE} = {92463391-81BE-462B-AC3C-78C6C760741F} - {078AEF36-F319-4CE2-BAA2-5B58A6536B46} = {92463391-81BE-462B-AC3C-78C6C760741F} - {8F165A3F-A18C-4649-AA08-C0E1BA5F5C90} = {92463391-81BE-462B-AC3C-78C6C760741F} - {F1538809-7347-45D2-A7AC-C1D89CF0BBD4} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} - {296D4516-0323-4D28-955D-B0324E4F10BE} = {92463391-81BE-462B-AC3C-78C6C760741F} - {AC5CA24B-B81E-4B20-B193-2E3983B1896C} = {92463391-81BE-462B-AC3C-78C6C760741F} - {5257B25D-330A-4DCF-ACED-B4709CFBF916} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} - {1D90F276-E1CA-4FDF-A173-EB889E7D3150} = {92463391-81BE-462B-AC3C-78C6C760741F} - {043B9497-C0BA-4770-9210-4456D2F81CE0} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8} = {92463391-81BE-462B-AC3C-78C6C760741F} - {3E7F2D49-3B45-45A8-9893-F73EC1EEBAAB} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} - {7D9ECCEE-71D1-4A42-ABEE-876AFA1B4FC9} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} - {6EA56B2B-89EC-4C38-A384-97D203375B06} = {92463391-81BE-462B-AC3C-78C6C760741F} - {72E89155-86C7-454E-BDD9-39F497F2F61B} = {92463391-81BE-462B-AC3C-78C6C760741F} + {50B155AF-6778-4FBF-AF97-0AD3DFF11564} = {FD09AA4B-FD90-4B88-8E74-77FBF96AFF07} + {6F476A56-25E8-4BDC-82D5-4EBA01D93765} = {FD09AA4B-FD90-4B88-8E74-77FBF96AFF07} + {D985E2C4-855B-4E62-AEC1-AD97F04BBA28} = {0E2AC9F5-F32F-457E-A166-8CA3DF684EED} + {F4446B51-F445-438B-89EC-DC435BE261DC} = {0E2AC9F5-F32F-457E-A166-8CA3DF684EED} + {EF471648-363D-49CD-804A-C4B97F654ED4} = {8DA7B398-7C2C-45D7-8DDE-A0A0C4FA2EB6} + {EAD32BF5-129C-44B9-994D-FCC10CF05C57} = {8DA7B398-7C2C-45D7-8DDE-A0A0C4FA2EB6} + {C375FC3D-0066-47E4-83AB-9537029FAD04} = {499B3A3F-B718-4176-ABF0-C0B083E406C0} + {E396C744-BFD5-459C-8E83-91A902E4039A} = {499B3A3F-B718-4176-ABF0-C0B083E406C0} + {55A97BE6-70D3-4C33-9B47-72F57272AF14} = {339C0D30-DB7D-49AE-BFBC-5F61AAD410BA} + {796399C5-702B-44F8-81FF-A528B6057442} = {1DDAB6E2-F2B2-45E6-99AF-EC113C591F93} + {D321AA23-31CC-4B60-A025-7A318EE02734} = {7527A78F-3DFC-4490-8D3F-F57C0B0019E0} + {0C0B97F2-E388-474E-9C03-BD1F3F7AAAC4} = {58E57F6D-A14F-4EA2-8D3F-557EC7792BEE} + {626AE302-6C1F-4A48-B78A-B50F97443A50} = {17CF4134-3941-4379-9A6D-1F86643CB7E0} + {53B7C33F-2DA2-45C3-8956-DD425496B33F} = {17CF4134-3941-4379-9A6D-1F86643CB7E0} + {6C544D1D-E6F0-49E1-999B-91C7B5EA0319} = {AB5A79CC-234D-421F-A1EB-CAE5DF4CB65D} + {A1933DF0-875D-4483-93C8-1D39C804BCBD} = {AB5A79CC-234D-421F-A1EB-CAE5DF4CB65D} + {7A197564-75FD-4A4C-B3AB-79D9B1A8C65E} = {B9A66356-EA7D-4BA6-BF1C-1174C7B2FD10} + {7476A912-974B-457C-8700-1101EF35CC91} = {B9A66356-EA7D-4BA6-BF1C-1174C7B2FD10} + {13B4F1CC-4632-41C3-9675-6824F6C8AEB4} = {22783456-A0CF-45B7-84B1-E25F647909A5} + {C6E4BEDB-9632-411E-A6B1-A4F6A88E8AAD} = {13B4F1CC-4632-41C3-9675-6824F6C8AEB4} + {A85AF698-6E66-434B-BBA8-D638C22C71B3} = {13B4F1CC-4632-41C3-9675-6824F6C8AEB4} + {B0632FF5-04FE-4278-9236-3BDE567ACFCA} = {13B4F1CC-4632-41C3-9675-6824F6C8AEB4} + {2D4C6E24-19FD-4BA7-BF8D-BAD2775F9F7D} = {13B4F1CC-4632-41C3-9675-6824F6C8AEB4} + {B38452AC-1AFF-40E4-8AD3-C137B8548379} = {1DDAB6E2-F2B2-45E6-99AF-EC113C591F93} + {913855F0-933B-4FA3-A535-F149F7DF4959} = {7527A78F-3DFC-4490-8D3F-F57C0B0019E0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {0035341D-175A-4D05-95E6-F1C2785A1E26} + SolutionGuid = {779069AC-1F9F-407F-92C7-28507D91D64E} EndGlobalSection EndGlobal diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/Microsoft.AspNetCore.Razor.csproj b/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj similarity index 71% rename from src/Razor/src/Microsoft.AspNetCore.Razor/Microsoft.AspNetCore.Razor.csproj rename to src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj index 29dfb82a7ba4..185205256ead 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor/Microsoft.AspNetCore.Razor.csproj +++ b/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj @@ -16,8 +16,8 @@ Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper - - + + diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/Properties/AssemblyInfo.cs b/src/Razor/Razor/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/Properties/AssemblyInfo.cs rename to src/Razor/Razor/src/Properties/AssemblyInfo.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/DefaultTagHelperContent.cs b/src/Razor/Razor/src/TagHelpers/DefaultTagHelperContent.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/DefaultTagHelperContent.cs rename to src/Razor/Razor/src/TagHelpers/DefaultTagHelperContent.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlAttributeNameAttribute.cs b/src/Razor/Razor/src/TagHelpers/HtmlAttributeNameAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlAttributeNameAttribute.cs rename to src/Razor/Razor/src/TagHelpers/HtmlAttributeNameAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlAttributeNotBoundAttribute.cs b/src/Razor/Razor/src/TagHelpers/HtmlAttributeNotBoundAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlAttributeNotBoundAttribute.cs rename to src/Razor/Razor/src/TagHelpers/HtmlAttributeNotBoundAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlAttributeValueStyle.cs b/src/Razor/Razor/src/TagHelpers/HtmlAttributeValueStyle.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlAttributeValueStyle.cs rename to src/Razor/Razor/src/TagHelpers/HtmlAttributeValueStyle.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlTargetElementAttribute.cs b/src/Razor/Razor/src/TagHelpers/HtmlTargetElementAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlTargetElementAttribute.cs rename to src/Razor/Razor/src/TagHelpers/HtmlTargetElementAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/ITagHelper.cs b/src/Razor/Razor/src/TagHelpers/ITagHelper.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/ITagHelper.cs rename to src/Razor/Razor/src/TagHelpers/ITagHelper.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/ITagHelperComponent.cs b/src/Razor/Razor/src/TagHelpers/ITagHelperComponent.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/ITagHelperComponent.cs rename to src/Razor/Razor/src/TagHelpers/ITagHelperComponent.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/NullHtmlEncoder.cs b/src/Razor/Razor/src/TagHelpers/NullHtmlEncoder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/NullHtmlEncoder.cs rename to src/Razor/Razor/src/TagHelpers/NullHtmlEncoder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/OutputElementHintAttribute.cs b/src/Razor/Razor/src/TagHelpers/OutputElementHintAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/OutputElementHintAttribute.cs rename to src/Razor/Razor/src/TagHelpers/OutputElementHintAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/ReadOnlyTagHelperAttributeList.cs b/src/Razor/Razor/src/TagHelpers/ReadOnlyTagHelperAttributeList.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/ReadOnlyTagHelperAttributeList.cs rename to src/Razor/Razor/src/TagHelpers/ReadOnlyTagHelperAttributeList.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/RestrictChildrenAttribute.cs b/src/Razor/Razor/src/TagHelpers/RestrictChildrenAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/RestrictChildrenAttribute.cs rename to src/Razor/Razor/src/TagHelpers/RestrictChildrenAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelper.cs b/src/Razor/Razor/src/TagHelpers/TagHelper.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelper.cs rename to src/Razor/Razor/src/TagHelpers/TagHelper.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperAttribute.cs b/src/Razor/Razor/src/TagHelpers/TagHelperAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperAttribute.cs rename to src/Razor/Razor/src/TagHelpers/TagHelperAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperAttributeList.cs b/src/Razor/Razor/src/TagHelpers/TagHelperAttributeList.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperAttributeList.cs rename to src/Razor/Razor/src/TagHelpers/TagHelperAttributeList.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperComponent.cs b/src/Razor/Razor/src/TagHelpers/TagHelperComponent.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperComponent.cs rename to src/Razor/Razor/src/TagHelpers/TagHelperComponent.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperContent.cs b/src/Razor/Razor/src/TagHelpers/TagHelperContent.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperContent.cs rename to src/Razor/Razor/src/TagHelpers/TagHelperContent.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperContext.cs b/src/Razor/Razor/src/TagHelpers/TagHelperContext.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperContext.cs rename to src/Razor/Razor/src/TagHelpers/TagHelperContext.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperOutput.cs b/src/Razor/Razor/src/TagHelpers/TagHelperOutput.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperOutput.cs rename to src/Razor/Razor/src/TagHelpers/TagHelperOutput.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagMode.cs b/src/Razor/Razor/src/TagHelpers/TagMode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagMode.cs rename to src/Razor/Razor/src/TagHelpers/TagMode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagStructure.cs b/src/Razor/Razor/src/TagHelpers/TagStructure.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagStructure.cs rename to src/Razor/Razor/src/TagHelpers/TagStructure.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/baseline.netcore.json b/src/Razor/Razor/src/baseline.netcore.json similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/baseline.netcore.json rename to src/Razor/Razor/src/baseline.netcore.json diff --git a/src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj b/src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj new file mode 100644 index 000000000000..04e4b086cb4f --- /dev/null +++ b/src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj @@ -0,0 +1,21 @@ + + + + $(StandardTestTfms) + $(DefaultItemExcludes);TestFiles\**\* + + + + + + + + + + + + + + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/DefaultTagHelperContentTest.cs b/src/Razor/Razor/test/TagHelpers/DefaultTagHelperContentTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/DefaultTagHelperContentTest.cs rename to src/Razor/Razor/test/TagHelpers/DefaultTagHelperContentTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/NullHtmlEncoderTest.cs b/src/Razor/Razor/test/TagHelpers/NullHtmlEncoderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/NullHtmlEncoderTest.cs rename to src/Razor/Razor/test/TagHelpers/NullHtmlEncoderTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs b/src/Razor/Razor/test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs rename to src/Razor/Razor/test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperAttributeListTest.cs b/src/Razor/Razor/test/TagHelpers/TagHelperAttributeListTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperAttributeListTest.cs rename to src/Razor/Razor/test/TagHelpers/TagHelperAttributeListTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperContextTest.cs b/src/Razor/Razor/test/TagHelpers/TagHelperContextTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperContextTest.cs rename to src/Razor/Razor/test/TagHelpers/TagHelperContextTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperOutputTest.cs b/src/Razor/Razor/test/TagHelpers/TagHelperOutputTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperOutputTest.cs rename to src/Razor/Razor/test/TagHelpers/TagHelperOutputTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/xunit.runner.json b/src/Razor/Razor/test/xunit.runner.json similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test/xunit.runner.json rename to src/Razor/Razor/test/xunit.runner.json diff --git a/src/Razor/src/RazorPageGenerator/Program.cs b/src/Razor/RazorPageGenerator/src/Program.cs similarity index 100% rename from src/Razor/src/RazorPageGenerator/Program.cs rename to src/Razor/RazorPageGenerator/src/Program.cs diff --git a/src/Razor/src/RazorPageGenerator/RazorPageGeneratorResult.cs b/src/Razor/RazorPageGenerator/src/RazorPageGeneratorResult.cs similarity index 100% rename from src/Razor/src/RazorPageGenerator/RazorPageGeneratorResult.cs rename to src/Razor/RazorPageGenerator/src/RazorPageGeneratorResult.cs diff --git a/src/Razor/src/RazorPageGenerator/RazorPageGenerator.csproj b/src/Razor/RazorPageGenerator/src/dotnet-razorpagegenerator.csproj similarity index 66% rename from src/Razor/src/RazorPageGenerator/RazorPageGenerator.csproj rename to src/Razor/RazorPageGenerator/src/dotnet-razorpagegenerator.csproj index 2668c16904b2..d32ad3437a17 100644 --- a/src/Razor/src/RazorPageGenerator/RazorPageGenerator.csproj +++ b/src/Razor/RazorPageGenerator/src/dotnet-razorpagegenerator.csproj @@ -7,10 +7,13 @@ RazorPageGenerator Exe false + true + false + false - + diff --git a/src/Razor/test/RazorPageGenerator.Test/RazorPageGenerator.Test.csproj b/src/Razor/RazorPageGenerator/test/RazorPageGenerator.Test.csproj similarity index 52% rename from src/Razor/test/RazorPageGenerator.Test/RazorPageGenerator.Test.csproj rename to src/Razor/RazorPageGenerator/test/RazorPageGenerator.Test.csproj index 6562721f98ec..96812fa85b26 100644 --- a/src/Razor/test/RazorPageGenerator.Test/RazorPageGenerator.Test.csproj +++ b/src/Razor/RazorPageGenerator/test/RazorPageGenerator.Test.csproj @@ -13,16 +13,8 @@ - - - - - - - - - - + + diff --git a/src/Razor/test/RazorPageGenerator.Test/RazorPageGeneratorTest.cs b/src/Razor/RazorPageGenerator/test/RazorPageGeneratorTest.cs similarity index 100% rename from src/Razor/test/RazorPageGenerator.Test/RazorPageGeneratorTest.cs rename to src/Razor/RazorPageGenerator/test/RazorPageGeneratorTest.cs diff --git a/src/Razor/test/RazorPageGenerator.Test/TestFiles/Views/TestFile.js b/src/Razor/RazorPageGenerator/test/TestFiles/Views/TestFile.js similarity index 100% rename from src/Razor/test/RazorPageGenerator.Test/TestFiles/Views/TestFile.js rename to src/Razor/RazorPageGenerator/test/TestFiles/Views/TestFile.js diff --git a/src/Razor/test/RazorPageGenerator.Test/TestFiles/Views/TestView.Designer.expected.cs b/src/Razor/RazorPageGenerator/test/TestFiles/Views/TestView.Designer.expected.cs similarity index 100% rename from src/Razor/test/RazorPageGenerator.Test/TestFiles/Views/TestView.Designer.expected.cs rename to src/Razor/RazorPageGenerator/test/TestFiles/Views/TestView.Designer.expected.cs diff --git a/src/Razor/test/RazorPageGenerator.Test/TestFiles/Views/TestView.cshtml b/src/Razor/RazorPageGenerator/test/TestFiles/Views/TestView.cshtml similarity index 100% rename from src/Razor/test/RazorPageGenerator.Test/TestFiles/Views/TestView.cshtml rename to src/Razor/RazorPageGenerator/test/TestFiles/Views/TestView.cshtml diff --git a/src/Razor/test/RazorPageGenerator.Test/xunit.runner.json b/src/Razor/RazorPageGenerator/test/xunit.runner.json similarity index 100% rename from src/Razor/test/RazorPageGenerator.Test/xunit.runner.json rename to src/Razor/RazorPageGenerator/test/xunit.runner.json diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj similarity index 95% rename from src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj rename to src/Razor/Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj index 95bb7fec04c7..cf4b9e5f8823 100644 --- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj +++ b/src/Razor/Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj @@ -1,4 +1,4 @@ - + Razor is a markup syntax for adding server-side logic to web pages. This package contains MSBuild support for Razor. netstandard2.0 diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props b/src/Razor/Sdk.Razor/src/Sdk/Sdk.props similarity index 100% rename from src/Razor/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props rename to src/Razor/Sdk.Razor/src/Sdk/Sdk.props diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets b/src/Razor/Sdk.Razor/src/Sdk/Sdk.targets similarity index 100% rename from src/Razor/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets rename to src/Razor/Sdk.Razor/src/Sdk/Sdk.targets diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/src/Razor/Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets similarity index 100% rename from src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets rename to src/Razor/Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets similarity index 100% rename from src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets rename to src/Razor/Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets b/src/Razor/Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets similarity index 100% rename from src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets rename to src/Razor/Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props b/src/Razor/Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props similarity index 100% rename from src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props rename to src/Razor/Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorConfiguration.xaml b/src/Razor/Sdk.Razor/src/build/netstandard2.0/Rules/RazorConfiguration.xaml similarity index 100% rename from src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorConfiguration.xaml rename to src/Razor/Sdk.Razor/src/build/netstandard2.0/Rules/RazorConfiguration.xaml diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorExtension.xaml b/src/Razor/Sdk.Razor/src/build/netstandard2.0/Rules/RazorExtension.xaml similarity index 100% rename from src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorExtension.xaml rename to src/Razor/Sdk.Razor/src/build/netstandard2.0/Rules/RazorExtension.xaml diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorGeneral.xaml b/src/Razor/Sdk.Razor/src/build/netstandard2.0/Rules/RazorGeneral.xaml similarity index 100% rename from src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorGeneral.xaml rename to src/Razor/Sdk.Razor/src/build/netstandard2.0/Rules/RazorGeneral.xaml diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props similarity index 100% rename from src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.props rename to src/Razor/Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets similarity index 100% rename from src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets rename to src/Razor/Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props b/src/Razor/Sdk.Razor/src/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props similarity index 100% rename from src/Razor/src/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props rename to src/Razor/Sdk.Razor/src/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets b/src/Razor/Sdk.Razor/src/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets similarity index 100% rename from src/Razor/src/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets rename to src/Razor/Sdk.Razor/src/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets diff --git a/src/Razor/build.cmd b/src/Razor/build.cmd deleted file mode 100644 index f4169ea5e411..000000000000 --- a/src/Razor/build.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@ECHO OFF -SET RepoRoot="%~dp0..\.." -%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -Path %~dp0 %* diff --git a/src/Razor/build.sh b/src/Razor/build.sh deleted file mode 100644 index d5bb0cf6312d..000000000000 --- a/src/Razor/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -repo_root="$DIR/../.." -"$repo_root/build.sh" --path "$DIR" --lockfile "$repo_root/korebuild-lock.txt" "$@" diff --git a/src/Razor/build/Key.snk b/src/Razor/build/Key.snk deleted file mode 100644 index e10e4889c125..000000000000 Binary files a/src/Razor/build/Key.snk and /dev/null differ diff --git a/src/Razor/build/buildpipeline/linux.groovy b/src/Razor/build/buildpipeline/linux.groovy deleted file mode 100644 index 903f218bb817..000000000000 --- a/src/Razor/build/buildpipeline/linux.groovy +++ /dev/null @@ -1,10 +0,0 @@ -@Library('dotnet-ci') _ - -simpleNode('Ubuntu16.04', 'latest-or-auto-docker') { - stage ('Checking out source') { - checkout scm - } - stage ('Build') { - sh './build.sh --ci' - } -} diff --git a/src/Razor/build/buildpipeline/osx.groovy b/src/Razor/build/buildpipeline/osx.groovy deleted file mode 100644 index aaac63686b53..000000000000 --- a/src/Razor/build/buildpipeline/osx.groovy +++ /dev/null @@ -1,10 +0,0 @@ -@Library('dotnet-ci') _ - -simpleNode('OSX10.12','latest') { - stage ('Checking out source') { - checkout scm - } - stage ('Build') { - sh './build.sh --ci' - } -} diff --git a/src/Razor/build/buildpipeline/pipeline.groovy b/src/Razor/build/buildpipeline/pipeline.groovy deleted file mode 100644 index e915cadae124..000000000000 --- a/src/Razor/build/buildpipeline/pipeline.groovy +++ /dev/null @@ -1,18 +0,0 @@ -import org.dotnet.ci.pipelines.Pipeline - -def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy') -def linuxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/linux.groovy') -def osxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/osx.groovy') -String configuration = 'Release' -def parameters = [ - 'Configuration': configuration -] - -windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", parameters) -windowsPipeline.triggerPipelineOnGithubPush(parameters) - -linuxPipeline.triggerPipelineOnEveryGithubPR("Ubuntu 16.04 ${configuration} Build", parameters) -linuxPipeline.triggerPipelineOnGithubPush(parameters) - -osxPipeline.triggerPipelineOnEveryGithubPR("OSX 10.12 ${configuration} Build", parameters) -osxPipeline.triggerPipelineOnGithubPush(parameters) diff --git a/src/Razor/build/buildpipeline/windows.groovy b/src/Razor/build/buildpipeline/windows.groovy deleted file mode 100644 index 26f49c395da9..000000000000 --- a/src/Razor/build/buildpipeline/windows.groovy +++ /dev/null @@ -1,12 +0,0 @@ -@Library('dotnet-ci') _ - -// 'node' indicates to Jenkins that the enclosed block runs on a node that matches -// the label 'windows-with-vs' -simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { - stage ('Checking out source') { - checkout scm - } - stage ('Build') { - bat '.\\run.cmd -CI default-build' - } -} diff --git a/src/Razor/build/dependencies.props b/src/Razor/build/dependencies.props deleted file mode 100644 index 294cf2f14e4a..000000000000 --- a/src/Razor/build/dependencies.props +++ /dev/null @@ -1,71 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 0.10.13 - 2.1.3-rtm-15802 - 15.6.82 - 15.6.82 - 15.6.82 - 2.8.0 - 2.8.0 - 2.1.0 - 2.0.0 - 2.1.2 - 15.6.1 - 15.0.26606 - 15.6.161-preview - 15.6.161-preview - 7.10.6070 - 15.3.224 - 2.0.6142705 - 15.3.224 - 15.0.26606 - 10.0.30319 - 11.0.61030 - 12.0.30110 - 8.0.50727 - 9.0.30729 - 7.10.6071 - 15.6.161-preview - 1.3.8 - 1.0.1 - 4.7.49 - 2.0.3 - 11.0.2 - 1.1.92 - 4.5.0 - 4.3.0 - 4.5.0 - 9.0.1 - 2.8.0 - 2.8.0 - 2.8.0 - 2.8.0 - 2.8.0 - 2.8.0-beta2-62721-09 - 2.8.0 - 2.8.0 - 2.8.0 - 2.8.0-beta2-62721-09 - 0.8.0 - 2.3.1 - 2.4.0-beta.1.build3945 - - - - - - - - 2.1.1 - 2.1.1 - 2.1.0 - 2.1.1 - 2.1.1 - 2.1.1 - - \ No newline at end of file diff --git a/src/Razor/build/repo.props b/src/Razor/build/repo.props deleted file mode 100644 index 82355a1443f5..000000000000 --- a/src/Razor/build/repo.props +++ /dev/null @@ -1,25 +0,0 @@ - - - - - true - - - - - - - - - - - - - - - - - - - - diff --git a/src/Razor/build/repo.targets b/src/Razor/build/repo.targets deleted file mode 100644 index f9ef2f96ae7f..000000000000 --- a/src/Razor/build/repo.targets +++ /dev/null @@ -1,31 +0,0 @@ - - - - - Configuration=$(Configuration)NoVSIX - - - - - $(PrepareDependsOn);GenerateMSBuildLocationFile - $(RepositoryRoot)test\Microsoft.AspNetCore.Razor.Design.Test\ - $(RazorDesignTestProject)BuildVariables.cs.template - $(RazorDesignTestProject)obj\BuildVariables.generated.cs - - - - - - MSBuildLocation=$(VisualStudioMSBuildx86Path) - - - - - - diff --git a/src/Razor/build/sources.props b/src/Razor/build/sources.props deleted file mode 100644 index 02efac45499e..000000000000 --- a/src/Razor/build/sources.props +++ /dev/null @@ -1,21 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - https://dotnet.myget.org/F/msbuild/api/v3/index.json; - https://dotnet.myget.org/F/roslyn/api/v3/index.json; - https://vside.myget.org/F/vssdk/api/v3/index.json; - https://vside.myget.org/F/vsmac/api/v3/index.json - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - - diff --git a/src/Razor/src/Directory.Build.props b/src/Razor/src/Directory.Build.props deleted file mode 100644 index 052553775a5b..000000000000 --- a/src/Razor/src/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - $(NoWarn);CS1591 - true - aspnetcore;cshtml;razor - - - diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj b/src/Razor/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj deleted file mode 100644 index 4391fc3cdf6f..000000000000 --- a/src/Razor/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure. - net46;netstandard2.0 - - - - - - - - - - - - - - - - diff --git a/src/Razor/test/Directory.Build.props b/src/Razor/test/Directory.Build.props deleted file mode 100644 index 8ad3d56d0efe..000000000000 --- a/src/Razor/test/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - netcoreapp2.1 - $(DeveloperBuildTestTfms) - $(StandardTestTfms) - net461;$(StandardTestTfms) - - diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj deleted file mode 100644 index 8dcca8cc7cc6..000000000000 --- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj +++ /dev/null @@ -1,51 +0,0 @@ - - - - $(StandardTestTfms) - true - $(DefaultItemExcludes);TestFiles\** - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - Content - PreserveNewest - Build - - - - - - - - - - - - - - diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj deleted file mode 100644 index 808b0f3eea9a..000000000000 --- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj +++ /dev/null @@ -1,51 +0,0 @@ - - - - $(StandardTestTfms) - true - $(DefaultItemExcludes);TestFiles\** - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - Content - PreserveNewest - Build - - - - - - - - - - - - - - diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj deleted file mode 100644 index 68d1243acfd6..000000000000 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - $(DeveloperBuildTestTfms) - $(TargetFrameworks) - $(TargetFrameworks);net46 - $(DefaultItemExcludes);TestFiles\**\* - $(DefineConstants);GENERATE_BASELINES - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj deleted file mode 100644 index f5623d9d1745..000000000000 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - $(StandardTestTfms) - $(DefaultItemExcludes);TestFiles\**\* - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index cf35d8f8d753..000000000000 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - $(DefineConstants);GENERATE_BASELINES - $(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES - netcoreapp2.1;netcoreapp2.0;net46 - - - - - - - - - - - - - - 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 deleted file mode 100644 index 6872d97beb6a..000000000000 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - netstandard2.0 - - - - - - - - - - - - - - - diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/Microsoft.AspNetCore.Razor.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test/Microsoft.AspNetCore.Razor.Test.csproj deleted file mode 100644 index b178b1b2c275..000000000000 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/Microsoft.AspNetCore.Razor.Test.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - $(StandardTestTfms) - $(DefaultItemExcludes);TestFiles\**\* - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Microsoft.AspNetCore.Razor.Tools.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Microsoft.AspNetCore.Razor.Tools.Test.csproj deleted file mode 100644 index cef7bd4594e7..000000000000 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Microsoft.AspNetCore.Razor.Tools.Test.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - netcoreapp2.1 - - - - - - - - - - - - - - - - diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Test/Microsoft.CodeAnalysis.Razor.Test.csproj b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Test/Microsoft.CodeAnalysis.Razor.Test.csproj deleted file mode 100644 index 7b4cde7c1489..000000000000 --- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Test/Microsoft.CodeAnalysis.Razor.Test.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - $(StandardTestTfms) - $(DefaultItemExcludes);TestFiles\**\* - true - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Razor/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj deleted file mode 100644 index b0ca8cfd762b..000000000000 --- a/src/Razor/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\ - - - - - - <_MvcExtensionAssemblyPath>$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll - - - - - netcoreapp2.0 - - - - - - - - - - diff --git a/src/Razor/test/testapps/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testapps/ClassLibrary/ClassLibrary.csproj deleted file mode 100644 index 93f2b997a974..000000000000 --- a/src/Razor/test/testapps/ClassLibrary/ClassLibrary.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\ - - - - - - - <_MvcExtensionAssemblyPath>$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll - - - - - netstandard2.0 - - © Microsoft - Razor Test - Microsoft - ClassLibrary Description - - - - - - - diff --git a/src/Razor/test/testapps/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testapps/ClassLibrary2/ClassLibrary2.csproj deleted file mode 100644 index 86cbd96b6171..000000000000 --- a/src/Razor/test/testapps/ClassLibrary2/ClassLibrary2.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\ - - - - - - - <_MvcExtensionAssemblyPath>$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll - - - - - netstandard2.0 - - - - - - - - - - - diff --git a/src/Razor/test/testapps/Directory.Build.targets b/src/Razor/test/testapps/Directory.Build.targets deleted file mode 100644 index e0191e25d7f4..000000000000 --- a/src/Razor/test/testapps/Directory.Build.targets +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Razor/test/testapps/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testapps/SimpleMvc/SimpleMvc.csproj deleted file mode 100644 index 21ea1afc3c27..000000000000 --- a/src/Razor/test/testapps/SimpleMvc/SimpleMvc.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\ - - - - - - - <_MvcExtensionAssemblyPath>$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll - - - - - netcoreapp2.0 - - - - - - - diff --git a/src/Razor/test/testapps/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testapps/SimpleMvcFSharp/SimpleMvcFSharp.fsproj deleted file mode 100644 index 4e469df73377..000000000000 --- a/src/Razor/test/testapps/SimpleMvcFSharp/SimpleMvcFSharp.fsproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\ - - - - - - - <_MvcExtensionAssemblyPath>$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll - - - - - netcoreapp2.0 - - - - - - - - - - - - diff --git a/src/Razor/test/testapps/SimplePages/SimplePages.csproj b/src/Razor/test/testapps/SimplePages/SimplePages.csproj deleted file mode 100644 index 2928d33d453d..000000000000 --- a/src/Razor/test/testapps/SimplePages/SimplePages.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\ - - - - - - - <_MvcExtensionAssemblyPath>$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll - - - - - netcoreapp2.0 - - - - - - - diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/CodeGeneration/TestCodeRenderingContext.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/CodeGeneration/TestCodeRenderingContext.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/CodeGeneration/TestCodeRenderingContext.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/CodeGeneration/TestCodeRenderingContext.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeSerializer.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntermediateNodeSerializer.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeSerializer.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntermediateNodeSerializer.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeVerifier.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntermediateNodeVerifier.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeVerifier.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntermediateNodeVerifier.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntializeTestFileAttribute.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntializeTestFileAttribute.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntializeTestFileAttribute.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntializeTestFileAttribute.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorDiagnosticSerializer.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/RazorDiagnosticSerializer.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorDiagnosticSerializer.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/RazorDiagnosticSerializer.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/SourceMappingsSerializer.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/SourceMappingsSerializer.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/SourceMappingsSerializer.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/SourceMappingsSerializer.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/BlockFactory.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/Legacy/BlockFactory.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/BlockFactory.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/Legacy/BlockFactory.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/BlockTypes.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/Legacy/BlockTypes.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/BlockTypes.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/Legacy/BlockTypes.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ErrorCollector.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/Legacy/ErrorCollector.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ErrorCollector.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/Legacy/ErrorCollector.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/Legacy/ParserTestBase.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/Legacy/ParserTestBase.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/RawTextSymbol.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/Legacy/RawTextSymbol.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/RawTextSymbol.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/Legacy/RawTextSymbol.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TestSpanBuilder.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/Legacy/TestSpanBuilder.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TestSpanBuilder.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/Legacy/TestSpanBuilder.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorEngineBuilderExtensions.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/RazorEngineBuilderExtensions.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorEngineBuilderExtensions.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/RazorEngineBuilderExtensions.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorProjectEngineBuilderExtensions.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/RazorProjectEngineBuilderExtensions.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorProjectEngineBuilderExtensions.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/RazorProjectEngineBuilderExtensions.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/SyntaxTreeVerifier.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/SyntaxTreeVerifier.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestBoundAttributeDescriptorBuilderExtensions.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/TestBoundAttributeDescriptorBuilderExtensions.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestBoundAttributeDescriptorBuilderExtensions.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/TestBoundAttributeDescriptorBuilderExtensions.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestFile.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/TestFile.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestFile.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/TestFile.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/TestProject.cs similarity index 51% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/TestProject.cs index 4cc8d85d6157..842b5067efb5 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs +++ b/src/Razor/test/testassets/Razor.Test.Common/Language/TestProject.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 Microsoft.AspNetCore.Testing; @@ -9,12 +10,25 @@ namespace Microsoft.AspNetCore.Razor.Language { public static class TestProject { + private static Dictionary _assemblyFolderLookup = new Dictionary() + { + { "Microsoft.AspNetCore.Razor.Language.Test", "Razor.Language" }, + { "Microsoft.AspNetCore.Mvc.Razor.Extensions.Test", "Mvc.Razor.Extensions" }, + { "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test", "Mvc.Razor.Extensions.Version1_X" }, + { "RazorPageGenerator.Test", "RazorPageGenerator" }, + }; + public static string GetProjectDirectory(Type type) { var solutionDir = TestPathUtilities.GetSolutionRootDirectory("Razor"); var assemblyName = type.Assembly.GetName().Name; - var projectDirectory = Path.Combine(solutionDir, "test", assemblyName); + var folderName = assemblyName; + if (_assemblyFolderLookup.ContainsKey(assemblyName)) + { + folderName = _assemblyFolderLookup[assemblyName]; + } + var projectDirectory = Path.Combine(solutionDir, folderName, "test"); if (!Directory.Exists(projectDirectory)) { throw new InvalidOperationException( diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorCodeDocument.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/TestRazorCodeDocument.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorCodeDocument.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/TestRazorCodeDocument.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectFileSystem.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/TestRazorProjectFileSystem.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectFileSystem.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/TestRazorProjectFileSystem.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectItem.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/TestRazorProjectItem.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectItem.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/TestRazorProjectItem.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorSourceDocument.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/TestRazorSourceDocument.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorSourceDocument.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/TestRazorSourceDocument.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRequiredAttributeDescriptorBuilderExtensions.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/TestRequiredAttributeDescriptorBuilderExtensions.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRequiredAttributeDescriptorBuilderExtensions.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/TestRequiredAttributeDescriptorBuilderExtensions.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperDescriptorBuilderExtensions.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/TestTagHelperDescriptorBuilderExtensions.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperDescriptorBuilderExtensions.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/TestTagHelperDescriptorBuilderExtensions.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperFeature.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/TestTagHelperFeature.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperFeature.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/TestTagHelperFeature.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagMatchingRuleDescriptorBuilderExtensions.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/TestTagMatchingRuleDescriptorBuilderExtensions.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagMatchingRuleDescriptorBuilderExtensions.cs rename to src/Razor/test/testassets/Razor.Test.Common/Language/TestTagMatchingRuleDescriptorBuilderExtensions.cs diff --git a/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj new file mode 100644 index 000000000000..90658e36120b --- /dev/null +++ b/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj @@ -0,0 +1,23 @@ + + + + + $(DefineConstants);GENERATE_BASELINES + $(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES + netcoreapp2.1;netcoreapp2.0;net46 + true + + + + + + + + + + + + + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs b/src/Razor/test/testassets/Razor.Test.Common/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs rename to src/Razor/test/testassets/Razor.Test.Common/Properties/AssemblyInfo.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs b/src/Razor/test/testassets/Razor.Test.Common/TestCompilation.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs rename to src/Razor/test/testassets/Razor.Test.Common/TestCompilation.cs diff --git a/src/Razor/test/testassets/Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj b/src/Razor/test/testassets/Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj new file mode 100644 index 000000000000..7f4d282f588b --- /dev/null +++ b/src/Razor/test/testassets/Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj @@ -0,0 +1,20 @@ + + + + netstandard2.0 + true + + + + + + + + + + + + + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs 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/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj similarity index 53% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj index 1562a234c3c2..58509c2ad483 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj +++ b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj @@ -3,14 +3,15 @@ netcoreapp2.1;netcoreapp2.0;net461 true + true - + - + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/xunit.runner.json b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/xunit.runner.json similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/xunit.runner.json rename to src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/xunit.runner.json diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ActionResult.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ActionResult.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ActionResult.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ActionResult.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IActionResult.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IActionResult.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IActionResult.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IActionResult.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IUrlHelper.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IUrlHelper.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IUrlHelper.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IUrlHelper.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/RedirectResult.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/RedirectResult.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/RedirectResult.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/RedirectResult.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj similarity index 53% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj rename to src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj index 1562a234c3c2..58509c2ad483 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj +++ b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj @@ -3,14 +3,15 @@ netcoreapp2.1;netcoreapp2.0;net461 true + true - + - + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/xunit.runner.json b/src/Razor/test/testassets/Razor.Test.MvcShim/xunit.runner.json similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/xunit.runner.json rename to src/Razor/test/testassets/Razor.Test.MvcShim/xunit.runner.json diff --git a/src/Razor/version.props b/src/Razor/version.props deleted file mode 100644 index fd6f0750d1c7..000000000000 --- a/src/Razor/version.props +++ /dev/null @@ -1,25 +0,0 @@ - - - 2.1.2 - rtm - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - 99999 - $(BuildNumber) - - - - - 7.5.0 - $(VSForMacVersion).$(AddinBuildNumber) - - diff --git a/src/Razor/shared/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/CaseSensitiveBoundAttributeComparer.cs b/src/Shared/Razor/CaseSensitiveBoundAttributeComparer.cs similarity index 100% rename from src/Razor/shared/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/CaseSensitiveBoundAttributeComparer.cs rename to src/Shared/Razor/CaseSensitiveBoundAttributeComparer.cs