diff --git a/build/artifacts.props b/build/artifacts.props
index 0ae964e727fe..001be2727540 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -151,9 +151,7 @@
     <PackageArtifact Include="Microsoft.AspNetCore.WebSockets" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.WebUtilities" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore" Category="ship" />
-    <PackageArtifact Include="Microsoft.CodeAnalysis.Razor.Workspaces" Category="shipoob" />
     <PackageArtifact Include="Microsoft.CodeAnalysis.Razor" Category="ship" />
-    <PackageArtifact Include="Microsoft.CodeAnalysis.Remote.Razor" Category="shipoob" />
     <PackageArtifact Include="Microsoft.Data.Sqlite.Core" Category="ship" />
     <PackageArtifact Include="Microsoft.Data.Sqlite" Category="ship" />
     <PackageArtifact Include="Microsoft.DotNet.Web.Client.ItemTemplates" Category="ship" />
@@ -184,9 +182,6 @@
     <PackageArtifact Include="Microsoft.Net.Http.Headers" Category="ship" />
     <PackageArtifact Include="Microsoft.NET.Sdk.Razor" Category="ship" />
     <PackageArtifact Include="Microsoft.Owin.Security.Interop" Category="noship" />
-    <PackageArtifact Include="Microsoft.VisualStudio.Editor.Razor" Category="shipoob" />
-    <PackageArtifact Include="Microsoft.VisualStudio.LanguageServices.Razor" Category="shipoob" />
-    <PackageArtifact Include="Microsoft.VisualStudio.Mac.LanguageServices.Razor" Category="shipoob" />
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Contracts" Category="ship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Core" Category="ship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Category="ship" />
diff --git a/src/Razor/NuGetPackageVerifier.json b/src/Razor/NuGetPackageVerifier.json
index b62352e8b910..a6b622a7e434 100644
--- a/src/Razor/NuGetPackageVerifier.json
+++ b/src/Razor/NuGetPackageVerifier.json
@@ -5,12 +5,7 @@
     ],
     "packages": {
       "Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources": {},
-      "RazorPageGenerator": {},
-      "Microsoft.CodeAnalysis.Razor.Workspaces": {},
-      "Microsoft.CodeAnalysis.Remote.Razor": {},
-      "Microsoft.VisualStudio.Editor.Razor": {},
-      "Microsoft.VisualStudio.LanguageServices.Razor": {},
-      "Microsoft.VisualStudio.Mac.LanguageServices.Razor": {}
+      "RazorPageGenerator": {}
     }
   },
   "Default": { // Rules to run for packages not listed in any other set.
diff --git a/src/Razor/Razor.sln b/src/Razor/Razor.sln
index 5bb3137be261..b4446df80626 100644
--- a/src/Razor/Razor.sln
+++ b/src/Razor/Razor.sln
@@ -31,24 +31,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.
 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}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Razor.Workspaces", "src\Microsoft.CodeAnalysis.Razor.Workspaces\Microsoft.CodeAnalysis.Razor.Workspaces.csproj", "{0F265874-C592-448B-BC4F-3430AB03E0DC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Remote.Razor", "src\Microsoft.CodeAnalysis.Remote.Razor\Microsoft.CodeAnalysis.Remote.Razor.csproj", "{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tooling", "tooling", "{C0CC1E1F-1559-44DE-93A8-63259CEA2AAB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualStudio.RazorExtension", "tooling\Microsoft.VisualStudio.RazorExtension\Microsoft.VisualStudio.RazorExtension.csproj", "{D66B45B5-CBFD-4947-81F1-F30AB80EA992}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Razor", "src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj", "{42403DAF-F0BC-4F3A-B7F2-46D7013345D8}"
 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}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.LanguageServices.Razor", "src\Microsoft.VisualStudio.LanguageServices.Razor\Microsoft.VisualStudio.LanguageServices.Razor.csproj", "{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPageGenerator.Test", "test\RazorPageGenerator.Test\RazorPageGenerator.Test.csproj", "{96EB1BD4-B8E0-4F52-A068-BBCACA7E3F63}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.LanguageServices.Razor.Test", "test\Microsoft.VisualStudio.LanguageServices.Razor.Test\Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj", "{37E61BDB-658E-4F44-A499-D64CC6D35485}"
-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}"
 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}"
@@ -57,38 +45,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.
 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}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Razor.Workspaces.Test", "test\Microsoft.CodeAnalysis.Razor.Workspaces.Test\Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj", "{C61AAE12-5007-4205-A220-68F354A7F235}"
-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}"
 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}"
 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}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Editor.Razor", "src\Microsoft.VisualStudio.Editor.Razor\Microsoft.VisualStudio.Editor.Razor.csproj", "{0BCDE75A-A438-46C7-95E9-391F029D07C5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Editor.Razor.Test", "test\Microsoft.VisualStudio.Editor.Razor.Test\Microsoft.VisualStudio.Editor.Razor.Test.csproj", "{AA888DB9-340E-4E06-A2A4-25BFEE1AC2B7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Editor.Razor.Test.Common", "test\Microsoft.VisualStudio.Editor.Razor.Test.Common\Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj", "{FC684D4F-D23C-407C-9C68-E10EF3B38560}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Mac.RazorAddin", "tooling\Microsoft.VisualStudio.Mac.RazorAddin\Microsoft.VisualStudio.Mac.RazorAddin.csproj", "{FAF9986F-E086-4513-9D52-F7BF5FFCF31D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Mac.LanguageServices.Razor", "src\Microsoft.VisualStudio.Mac.LanguageServices.Razor\Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj", "{95B18DEE-8B45-4CF0-B9F8-CCBAF3B5251A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test", "test\Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test\Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test.csproj", "{B8A3E4CA-D54A-441F-A3BF-E00F060CA042}"
-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}"
 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}"
 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}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Performance", "benchmarks\Microsoft.AspNetCore.Razor.Performance\Microsoft.AspNetCore.Razor.Performance.csproj", "{6205467F-E381-4C42-AEEC-763BD62B3D5E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{C2C98051-0F39-47F2-80B6-E72B29159F2C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common", "test\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj", "{933101DA-C4CC-401A-AA01-2784E1025B7F}"
-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}"
 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}"
@@ -153,28 +121,6 @@ Global
 		{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
-		{0F265874-C592-448B-BC4F-3430AB03E0DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F265874-C592-448B-BC4F-3430AB03E0DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F265874-C592-448B-BC4F-3430AB03E0DC}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F265874-C592-448B-BC4F-3430AB03E0DC}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{0F265874-C592-448B-BC4F-3430AB03E0DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0F265874-C592-448B-BC4F-3430AB03E0DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0F265874-C592-448B-BC4F-3430AB03E0DC}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{0F265874-C592-448B-BC4F-3430AB03E0DC}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
-		{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
-		{D66B45B5-CBFD-4947-81F1-F30AB80EA992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D66B45B5-CBFD-4947-81F1-F30AB80EA992}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D66B45B5-CBFD-4947-81F1-F30AB80EA992}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{D66B45B5-CBFD-4947-81F1-F30AB80EA992}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D66B45B5-CBFD-4947-81F1-F30AB80EA992}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D66B45B5-CBFD-4947-81F1-F30AB80EA992}.ReleaseNoVSIX|Any CPU.ActiveCfg = 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
@@ -191,14 +137,6 @@ Global
 		{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
-		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.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
@@ -207,14 +145,6 @@ Global
 		{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
-		{37E61BDB-658E-4F44-A499-D64CC6D35485}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{37E61BDB-658E-4F44-A499-D64CC6D35485}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{37E61BDB-658E-4F44-A499-D64CC6D35485}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{37E61BDB-658E-4F44-A499-D64CC6D35485}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{37E61BDB-658E-4F44-A499-D64CC6D35485}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{37E61BDB-658E-4F44-A499-D64CC6D35485}.Release|Any CPU.Build.0 = Release|Any CPU
-		{37E61BDB-658E-4F44-A499-D64CC6D35485}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{37E61BDB-658E-4F44-A499-D64CC6D35485}.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
@@ -247,14 +177,6 @@ Global
 		{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
-		{C61AAE12-5007-4205-A220-68F354A7F235}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C61AAE12-5007-4205-A220-68F354A7F235}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C61AAE12-5007-4205-A220-68F354A7F235}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{C61AAE12-5007-4205-A220-68F354A7F235}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{C61AAE12-5007-4205-A220-68F354A7F235}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C61AAE12-5007-4205-A220-68F354A7F235}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C61AAE12-5007-4205-A220-68F354A7F235}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{C61AAE12-5007-4205-A220-68F354A7F235}.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
@@ -279,54 +201,6 @@ Global
 		{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
-		{0BCDE75A-A438-46C7-95E9-391F029D07C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0BCDE75A-A438-46C7-95E9-391F029D07C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0BCDE75A-A438-46C7-95E9-391F029D07C5}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{0BCDE75A-A438-46C7-95E9-391F029D07C5}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{0BCDE75A-A438-46C7-95E9-391F029D07C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0BCDE75A-A438-46C7-95E9-391F029D07C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0BCDE75A-A438-46C7-95E9-391F029D07C5}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{0BCDE75A-A438-46C7-95E9-391F029D07C5}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
-		{AA888DB9-340E-4E06-A2A4-25BFEE1AC2B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA888DB9-340E-4E06-A2A4-25BFEE1AC2B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA888DB9-340E-4E06-A2A4-25BFEE1AC2B7}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA888DB9-340E-4E06-A2A4-25BFEE1AC2B7}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{AA888DB9-340E-4E06-A2A4-25BFEE1AC2B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA888DB9-340E-4E06-A2A4-25BFEE1AC2B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA888DB9-340E-4E06-A2A4-25BFEE1AC2B7}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{AA888DB9-340E-4E06-A2A4-25BFEE1AC2B7}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
-		{FC684D4F-D23C-407C-9C68-E10EF3B38560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC684D4F-D23C-407C-9C68-E10EF3B38560}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC684D4F-D23C-407C-9C68-E10EF3B38560}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC684D4F-D23C-407C-9C68-E10EF3B38560}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{FC684D4F-D23C-407C-9C68-E10EF3B38560}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FC684D4F-D23C-407C-9C68-E10EF3B38560}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC684D4F-D23C-407C-9C68-E10EF3B38560}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{FC684D4F-D23C-407C-9C68-E10EF3B38560}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
-		{FAF9986F-E086-4513-9D52-F7BF5FFCF31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FAF9986F-E086-4513-9D52-F7BF5FFCF31D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FAF9986F-E086-4513-9D52-F7BF5FFCF31D}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{FAF9986F-E086-4513-9D52-F7BF5FFCF31D}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{FAF9986F-E086-4513-9D52-F7BF5FFCF31D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FAF9986F-E086-4513-9D52-F7BF5FFCF31D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FAF9986F-E086-4513-9D52-F7BF5FFCF31D}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{FAF9986F-E086-4513-9D52-F7BF5FFCF31D}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
-		{95B18DEE-8B45-4CF0-B9F8-CCBAF3B5251A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{95B18DEE-8B45-4CF0-B9F8-CCBAF3B5251A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95B18DEE-8B45-4CF0-B9F8-CCBAF3B5251A}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{95B18DEE-8B45-4CF0-B9F8-CCBAF3B5251A}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{95B18DEE-8B45-4CF0-B9F8-CCBAF3B5251A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{95B18DEE-8B45-4CF0-B9F8-CCBAF3B5251A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{95B18DEE-8B45-4CF0-B9F8-CCBAF3B5251A}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{95B18DEE-8B45-4CF0-B9F8-CCBAF3B5251A}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
-		{B8A3E4CA-D54A-441F-A3BF-E00F060CA042}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8A3E4CA-D54A-441F-A3BF-E00F060CA042}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B8A3E4CA-D54A-441F-A3BF-E00F060CA042}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8A3E4CA-D54A-441F-A3BF-E00F060CA042}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{B8A3E4CA-D54A-441F-A3BF-E00F060CA042}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B8A3E4CA-D54A-441F-A3BF-E00F060CA042}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B8A3E4CA-D54A-441F-A3BF-E00F060CA042}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{B8A3E4CA-D54A-441F-A3BF-E00F060CA042}.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
@@ -351,22 +225,6 @@ Global
 		{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
-		{6205467F-E381-4C42-AEEC-763BD62B3D5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6205467F-E381-4C42-AEEC-763BD62B3D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6205467F-E381-4C42-AEEC-763BD62B3D5E}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{6205467F-E381-4C42-AEEC-763BD62B3D5E}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{6205467F-E381-4C42-AEEC-763BD62B3D5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6205467F-E381-4C42-AEEC-763BD62B3D5E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6205467F-E381-4C42-AEEC-763BD62B3D5E}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{6205467F-E381-4C42-AEEC-763BD62B3D5E}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
-		{933101DA-C4CC-401A-AA01-2784E1025B7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{933101DA-C4CC-401A-AA01-2784E1025B7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{933101DA-C4CC-401A-AA01-2784E1025B7F}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{933101DA-C4CC-401A-AA01-2784E1025B7F}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{933101DA-C4CC-401A-AA01-2784E1025B7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{933101DA-C4CC-401A-AA01-2784E1025B7F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{933101DA-C4CC-401A-AA01-2784E1025B7F}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{933101DA-C4CC-401A-AA01-2784E1025B7F}.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
@@ -410,33 +268,19 @@ Global
 		{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}
-		{0F265874-C592-448B-BC4F-3430AB03E0DC} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
-		{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
-		{D66B45B5-CBFD-4947-81F1-F30AB80EA992} = {C0CC1E1F-1559-44DE-93A8-63259CEA2AAB}
 		{42403DAF-F0BC-4F3A-B7F2-46D7013345D8} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{7A8A1664-37CE-4376-81CA-1862CF5F91D9} = {92463391-81BE-462B-AC3C-78C6C760741F}
-		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{96EB1BD4-B8E0-4F52-A068-BBCACA7E3F63} = {92463391-81BE-462B-AC3C-78C6C760741F}
-		{37E61BDB-658E-4F44-A499-D64CC6D35485} = {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}
-		{C61AAE12-5007-4205-A220-68F354A7F235} = {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}
-		{0BCDE75A-A438-46C7-95E9-391F029D07C5} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
-		{AA888DB9-340E-4E06-A2A4-25BFEE1AC2B7} = {92463391-81BE-462B-AC3C-78C6C760741F}
-		{FC684D4F-D23C-407C-9C68-E10EF3B38560} = {92463391-81BE-462B-AC3C-78C6C760741F}
-		{FAF9986F-E086-4513-9D52-F7BF5FFCF31D} = {C0CC1E1F-1559-44DE-93A8-63259CEA2AAB}
-		{95B18DEE-8B45-4CF0-B9F8-CCBAF3B5251A} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
-		{B8A3E4CA-D54A-441F-A3BF-E00F060CA042} = {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}
 		{323553F0-14AB-4FBD-9CF0-1CC0BE8056F8} = {92463391-81BE-462B-AC3C-78C6C760741F}
-		{6205467F-E381-4C42-AEEC-763BD62B3D5E} = {C2C98051-0F39-47F2-80B6-E72B29159F2C}
-		{933101DA-C4CC-401A-AA01-2784E1025B7F} = {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}
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/AssemblyInfo.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/AssemblyInfo.cs
deleted file mode 100644
index 32248e0d1b0a..000000000000
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/AssemblyInfo.cs
+++ /dev/null
@@ -1 +0,0 @@
-[assembly: BenchmarkDotNet.Attributes.AspNetCoreBenchmark]
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/CodeGenerationBenchmark.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/CodeGenerationBenchmark.cs
deleted file mode 100644
index c35e1db42f8b..000000000000
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/CodeGenerationBenchmark.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using BenchmarkDotNet.Attributes;
-using Microsoft.AspNetCore.Mvc.Razor.Extensions;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.AspNetCore.Razor.Performance
-{
-    public class CodeGenerationBenchmark
-    {
-        public CodeGenerationBenchmark()
-        {
-            var current = new DirectoryInfo(AppContext.BaseDirectory);
-            while  (current != null && !File.Exists(Path.Combine(current.FullName, "MSN.cshtml")))
-            {
-                current = current.Parent;
-            }
-
-            var root = current;
-            var fileSystem = RazorProjectFileSystem.Create(root.FullName);
-            
-            ProjectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem, b => RazorExtensions.Register(b)); ;
-
-            MSN = fileSystem.GetItem(Path.Combine(root.FullName, "MSN.cshtml"));
-        }
-
-        public RazorProjectEngine ProjectEngine { get; }
-
-        public RazorProjectItem MSN { get; }
-
-        [Benchmark(Description = "Razor Design Time Code Generation of MSN.com")]
-        public void CodeGeneration_DesignTime_LargeStaticFile()
-        {
-            var codeDocument = ProjectEngine.ProcessDesignTime(MSN);
-            var generated = codeDocument.GetCSharpDocument();
-
-            if (generated.Diagnostics.Count != 0)
-            {
-                throw new Exception("Error!" + Environment.NewLine + string.Join(Environment.NewLine, generated.Diagnostics));
-            }
-        }
-
-        [Benchmark(Description = "Razor Runtime Code Generation of MSN.com")]
-        public void CodeGeneration_Runtime_LargeStaticFile()
-        {
-            var codeDocument = ProjectEngine.Process(MSN);
-            var generated = codeDocument.GetCSharpDocument();
-
-            if (generated.Diagnostics.Count != 0)
-            {
-                throw new Exception("Error!" + Environment.NewLine + string.Join(Environment.NewLine, generated.Diagnostics));
-            }
-        }
-    }
-}
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/MSN.cshtml b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/MSN.cshtml
deleted file mode 100644
index 7b3d7a3a08f1..000000000000
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/MSN.cshtml
+++ /dev/null
@@ -1,3983 +0,0 @@
-
-<!DOCTYPE html><html prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#"  lang="en-US"  style="font-size:62.5%"  class="hiperf"  dir="ltr" >
-
-<head data-info="v:2.0.5798.31020;a:cc7227b7-f7fe-4e3b-b644-226f3ef2c489;cn:125;az:{did:1f802c514e1c42e385b028b15ac20ce4, rid: 125, sn: westus-hp, dt: 2015-11-16T22:01:08.0825616Z, bt: 2015-11-17T01:14:47.5617874Z};ddpi:1;dpio:;dpi:1;dg:tmx.pc.webkit.chrome;th:start;PageName:startPage;m:en-us;cb:;l:en-us;mu:en-us;ud:{cid:,vk:homepage,n:,l:en-us,ck:};xd:AA3iOMG;ovc:f;al:;fxd:t;xdpub:2015-11-18 20:26:50Z;xdmap:2015-11-18 20:30:01Z;axd:;f:muidflt2cf,muidflt9-ismsft,d-thshldie1,d-thshldie2"  data-js="{&quot;dpi&quot;:1.0,&quot;ddpi&quot;:1.0,&quot;dpio&quot;:null,&quot;forcedpi&quot;:null,&quot;dms&quot;:6000,&quot;bds&quot;:7,&quot;dg&quot;:&quot;tmx.pc.webkit.chrome&quot;,&quot;ssl&quot;:false,&quot;moduleapi&quot;:&quot;http://www.msn.com/en-us/homepage/api/modules/fetch&quot;,&quot;cdnmoduleapi&quot;:&quot;http://static-hp-wus.s-msn.com/en-us/homepage/api/modules/cdnfetch&quot;,&quot;pdpdeltaupdateapi&quot;:&quot;http://www.msn.com/en-us/homepage/api/pdp/updatepdpdata&quot;,&quot;xd&quot;:&quot;aa3iomg&quot;,&quot;signedin&quot;:1,&quot;sso&quot;:&quot;&quot;,&quot;exchangeenabled&quot;:true,&quot;twitterimpenabled&quot;:true}"  data-client-settings="{&quot;geo_country&quot;:&quot;us&quot;,&quot;os_region&quot;:&quot;&quot;,&quot;apps_locale&quot;:&quot;&quot;,&quot;base_url&quot;:&quot;/en-us/homepage/&quot;,&quot;aid&quot;:&quot;cc7227b7f7fe4e3bb644226f3ef2c489&quot;,&quot;sid&quot;:null,&quot;v&quot;:&quot;2.0.5798.31020&quot;,&quot;static_page&quot;:false,&quot;fbid&quot;:&quot;132970837947&quot;,&quot;lvk&quot;:&quot;homepage&quot;,&quot;vk&quot;:&quot;homepage&quot;,&quot;cat&quot;:null,&quot;autorefresh&quot;:true,&quot;bingssl&quot;:false,&quot;autorefreshsettings&quot;:{&quot;is_market_enabled&quot;:false,&quot;timeout&quot;:0,&quot;idle_enabled&quot;:false,&quot;idle_timeout&quot;:&quot;2&quot;},&quot;uipr&quot;:true,&quot;uiprsettings&quot;:{&quot;enabled&quot;:true,&quot;frequency_minutes&quot;:&quot;5&quot;,&quot;banner_delay_minutes&quot;:null,&quot;maxfresh_display&quot;:null,&quot;minfresh_count&quot;:&quot;5&quot;,&quot;ajaxtimeoutinseconds&quot;:&quot;60&quot;},&quot;imgsrc&quot;:{&quot;quality_high&quot;:&quot;60&quot;,&quot;quality_low&quot;:&quot;5&quot;,&quot;order_timeout&quot;:&quot;1000&quot;},&quot;adsettings&quot;:{&quot;wait_for_ad_in_sec&quot;:&quot;3&quot;,&quot;retry_for_ad&quot;:&quot;2&quot;},&quot;mecontroluri&quot;:&quot;https://mem.gfx.ms/meversion/?partner=msn&amp;market=en-us&quot;,&quot;lazyload&quot;:{&quot;enabled&quot;:false,&quot;scroll_buffer&quot;:&quot;&quot;}}"  data-xd-id="AA3iOMG"  data-pdp-stale="true">
-        <meta charset="utf-8" />
-        <script>var _timing = { start: +new Date }</script>
-        
-        <link rel="dns-prefetch" href="//img-s-msn-com.akamaized.net" /><link rel="dns-prefetch" href="//rad.msn.com" /><link rel="dns-prefetch" href="//otf.msn.com" /><link rel="dns-prefetch" href="//c.msn.com" /><link rel="dns-prefetch" href="http://www.bing.com" /><link rel="canonical" href="http://www.msn.com/" /><link rel="alternate" hreflang="en-us" href="http://www.msn.com/en-us" /><meta name="msapplication-TileColor" content="#224f7b"/><meta name="msapplication-TileImage" content="//static-hp-wus.s-msn.com/sc/1f/08ced4.png"/><meta name="msapplication-config" content="none"/><meta name="robots" content="noydir,noodp"/>        <title>MSN.com - Hotmail, Outlook, Skype, Bing, Latest News, Photos &amp; Videos</title>
-<meta name="description" content="The new MSN, Your customizable collection of the best in news, sports, entertainment, money, weather, travel, health, and lifestyle, combined with Outlook, Facebook, Twitter, Skype, and more."/>
- <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no" />
-
-<link rel="stylesheet" href="//static-hp-wus.s-msn.com/en-us/homepage/_sc/css/6670b51d-4447aea4/direction=ltr.locales=en-us.themes=start.dpi=resolution1x/41-3299bd-2398dbc7/15-1b2d30-cb5e86eb/ec-c81f48-68ddb2ab/94-54ee79-4da0aefe/68-5613fa-6e6bf72e/62-225de0-292e10cc/83-32dc10-d55835e5/1b-aa34e2-d3c67b4a/60-83a32c-dbc6220a/14-b369eb-68bc8d97/ac-424960-129ee0ba/a4-acab8a-7367fee7/9d-b518e7-1b727fa2/a4-4cafe3-87c69f5d/49-ceacc9-3d54e7d0/59-ad48eb-dc5096f6/finance-css-e1-9b1a1f6f2e4be7f0f33748a6957e77-435afe8c/finance-css-6b-e41845462f63eb7b07c7d029e798ac-d3e3be75/54-56da71-64eec2/a8-36a2a3-b0fab04f/39-494f2f-4b5f58d3?ver=2.0.5798.31020&amp;fdhead=muidflt2cf,muidflt9-ismsft,d-thshldie1,d-thshldie2&amp;csopd=20151117233351&amp;csopdb=20151110211845" media="all" /><script>(function(n){function i(i,r){try{var u=new n.FontFace(i,r,{}).load();t.push(u)}catch(f){}}var t=[];typeof n.FontFace=="function"&&i("ps_g","url(//static-hp-wus.s-msn.com/sc/45/c9e14a.woff)")})(window),function(n,t){function o(n,i,r){typeof n!="string"&&(r=i,i=n,n=t);i&&i.splice||(r=i,i=[]);n=="c.dom"&&(l=!0);s(n,i,r)}function s(n,t,i,r){var e,o,s,h;n&&u[n]||(e=k(n,t),e?(s=typeof i=="function",h=l&&s&&n!="dap"&&n!="adLoad"&&t&&(t.length!=1||t[0]!="dap"&&t[0]!="c.dom"),h?setTimeout(function(){o=i.apply(null,e);a(n,o)},1):(o=s?i.apply(null,e):i,a(n,o))):f.push(r||{i:n,d:t,f:i}))}function a(t,i){t&&(i?(u[t]=i,v()):n.console&&console.error("Dependencies resolved, but object still not defined (or is otherwise falsey). id:"+t+"; typeof obj: "+typeof i))}function v(){var r,u,n,t;if(f.length&&!i){do for(r=f,u=r.length,f=[],i=1,t=0;t<u;t++)n=r[t],s(n.i,n.d,n.f,n);while(i>1);i=0}else i&&(i=2)}function k(i,r){for(var s,v,h,f=[],c=r?r.length:0,o=0;o<c;o++){var l=r[o],a=u[l],y=typeof a!="undefined";if(!y){if(s=b.exec(l),s)if(v=s[1],h=n[v],h!==t){f.push(h);continue}else e||(e=setTimeout(d,w));break}f.push(a)}return c==f.length?f:0}function d(){e=0;v()}function g(n,i,r){(typeof n!="object"||n&&n.splice)&&(r=i,i=n,n={});i&&i.splice||(r=i,i=[]);nt(n.js);r&&s(t,i,r)}function nt(n){if(typeof n=="string")y(n);else if(n)for(var t=0;t<n.length;t++)y(n[t])}function y(n){if(!c[n]){c[n]=1;var i=document.getElementsByTagName("script")[0],t=document.createElement("script");t.src=n;t.onload=t.onreadystatechange=function(){this.readyState&&this.readyState!="loaded"&&this.readyState!="complete"||(t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t))};i.parentNode.insertBefore(t,i)}}function tt(n){return p?n?r.now():Math.round(r.now()):new Date-h}var r=n.performance,h=((r||{}).timing||{}).navigationStart||(n._timing||{}).start||+new Date,p=r&&typeof r.now=="function",u={date:Date,document:document,image:Image,localStorage:n.localStorage,location:document.location,navigator:navigator,pageStart:h,pageTime:tt,screen:screen,window:n},f=[],i,w=50,e,c={},l=!1,b=/^window\.(.+)$/;o.amd={jQuery:1};o.is=function(n){return typeof u[n]!="undefined"};n.define=o;n.require=g}(window);define("perfPing",function(){function n(n){require(["w3cTimer"],n)}function t(t){n(function(n){n.mark(t)})}function i(t){n(function(n){n.fire();typeof t=="function"&&t(n.payload)})}return{setMarker:t,getPayLoad:i}});define("perfMarker",["window"],function(n){function s(){return f?t.now()|0:i&&o()-i}var t=n.performance,r;if(!t)return function(){};var f=typeof t.now=="function",e=typeof t.mark=="function",i=(t.timing||{}).navigationStart,o=typeof Date.now=="function"?Date.now:function(){return+new Date},u;return u=n.console&&typeof console.timeStamp=="function",r=n._pageTimings||(n._pageTimings={}),function(n,f){var o,h;typeof n!="string"||f&&r[n]||(o=typeof f=="number",o||(e&&t.mark(n),u&&console.timeStamp(n)),f&&(h=o?Math.round(f-i):s(),h&&(r[n]=h)))}})</script><script async="async"  src="//ads1.msads.net/library/8.4/dapmsn.js"></script><script async="async"  src="//static-hp-wus.s-msn.com/_h/d6ea042c/webcore/externalscripts/jquery/jquery-2.1.1.min.js" crossorigin="anonymous"></script><script async="async"  src="//static-hp-wus.s-msn.com/en-us/homepage/_sc/js/6670b51d-4af99b54/direction=ltr.locales=en-us.themes=start.dpi=resolution1x/db-99f9c3-23e92428/77-7209e9-6f8089e5/ed-fa8007-5599dabd/75-4a37b1-68ddb2ab/8a-b93261-68ddb2ab/8d-b97045-d1f8fb43/72-de97a3-68ddb2ab/finance-js-7e-4f8743b93a8937f16c7e79bc406825-e5780970/aa-fbd291-3e76eb4d/d1-e0486e-69add1ed/72-ff091d-68ddb2ab?ver=2.0.5798.31020&amp;fdhead=muidflt2cf,muidflt9-ismsft,d-thshldie1,d-thshldie2&amp;csopd=20151117233351&amp;csopdb=20151110211845" crossorigin="anonymous"></script><script>define("headData",["evaluate","document"],function(n,t){var r=t.getElementsByTagName("head")[0],i,u,f;return r?(i={},u=r.getAttribute("data-js"),u&&(i=n(u)),f=r.getAttribute("data-client-settings"),f&&(i.clientSettings=n(f)),i.xdid=r.getAttribute("data-xd-id"),i.locale=t.getElementsByTagName("html")[0].getAttribute("lang").toLowerCase(),i):{}});define("deviceGroup",function(){return{isTmx:1,isPc:1,isWebKit:1,isChrome:1}});define("measure",function(){return function(n,t){var i=window.getComputedStyle(n);return t?i[t]||i.getPropertyValue(t):function(n){return i[n]||i.getPropertyValue(n)}}});define("deviceInit",function(){function u(i){return n[t(i)]}function f(i){return n[t(i)]=="true"}var n={},t=function(n){return n.toUpperCase()},i,r={capability:u,isCapable:f};return function(u){var f,e;if(i)throw"device was already initialized.";for(f in u)e=u[f],n[t(f)]=e;i=1;define("device",r)}});define("requestAnimationFrame",["window"],function(n){return function(){return n.requestAnimationFrame||n.webkitRequestAnimationFrame||n.mozRequestAnimationFrame||n.oRequestAnimationFrame||n.msRequestAnimationFrame||function(t){typeof t=="function"&&n.setTimeout(t,16.7)}}()});define("mediator",function(){function i(n){return t[n]||(t[n]=new r),t[n]}function r(){var n={};return{pub:function(t,i){var u=n[t],r;if(u)for(r=0;r<u.length;r++)u[r](i)},sub:function(t,i){if(typeof i=="function"){var r=n[t];r||(r=[],n[t]=r);r.push(i)}},unsub:function(t,i){var u=n[t],r;if(u)for(r=0;r<u.length;r++)u[r]===i&&u.splice(r--,1)}}}var n=new r,t={};return{pub:n.pub,sub:n.sub,unsub:n.unsub,pubChannel:function(n,t,r){i(t).pub(n,r)},subChannel:function(n,t,r){i(t).sub(n,r)},unsubChannel:function(n,t,r){i(t).unsub(n,r)}}});define("mediaQueryMatch",["device","deviceGroup","mediator","requestAnimationFrame","window"],function(n,t,i,r,u){function s(){function e(n,t){var i=n.exec(t);return i?i[1]*16:null}function n(){r(function(){t=u.innerWidth;f=u.innerHeight;for(var n=0;n<o.length;n++)h(o[n])})}function h(n){var r=p(n),t,i;if(n.matches!=r)for(n.matches=r,i=0;t=n.queryFunctions[i];i++)typeof t=="function"&&t()}function p(n){var i=!n.maxWidth||t<=n.maxWidth,r=!n.minWidth||t>=n.minWidth,u=!n.maxHeight||f<=n.maxHeight,e=!n.minHeight||f>=n.minHeight;return i&&r&&u&&e}function c(n){return{isMatching:function(){return!1},addListener:function(){},matches:!1,media:n,queryFunctions:[]}}var l=/min\-width\:\s*(\d+(\.\d+)?)/,a=/max\-width\:\s*(\d+(\.\d+)?)/,v=/min\-height\:\s*(\d+(\.\d+)?)/,y=/max\-height\:\s*(\d+(\.\d+)?)/,t,f,o=[],s;return require(["jquery"],function(t){t(u).resize(function(){clearTimeout(s);s=setTimeout(n,50)});require(["c.deferred"],n);setTimeout(n,500);i.subChannel("update","mediaQuery",n)}),function(i){if(!i)return c(i);var r={addListener:function(n){typeof n=="function"&&r.queryFunctions.push(n)},isMatching:function(){return n(),r.matches},matches:!1,media:i,queryFunctions:[]};return(r.minWidth=e(l,i),r.maxWidth=e(a,i),r.minHeight=e(v,i),r.maxHeight=e(y,i),!r.minWidth&&!r.maxWidth&&!r.minHeight&&!r.maxHeight)?c(i):(t=u.innerWidth,f=u.innerHeight,h(r),o.push(r),r)}}function h(n){var t=f(n);return t.isMatching=function(){return t.matches},t}var f=u.msMatchMedia||u.matchMedia,e=f?h:null,o=n.isCapable("UseCustomMatchMedia");return!o&&e||s()});define("scaledView",[],function(){return{addListener:function(){},removeListener:function(){},isScaled:function(){return!1}}});require(["measure","scaledView","document"],function(n,t,i){function u(){r=f.rem=parseFloat(n(i.getElementsByTagName("head")[0],"font-size"))}function f(n){return n*r}function e(n){return n/r}var r;t.addListener(u);u();define("remToPixel",function(){return f});define("pixelToRem",function(){return e})});define("viewAwareInit",["deviceGroup","pageTime","mediaQueryMatch","document","remToPixel"],function(n,t,i,r){return function(t){function f(n,t){var r,u,f;n&&(r=n.match(/calc\((.*?)\)/),r&&r.length==2&&(n=n.replace(r[0],eval(r[1]))),u=i(n),f=u.isMatching(),f&&(e=t),u.addListener(function(){u.matches&&s(t)}),h.push({mq:u,viewValue:t}))}function s(n){e=n;for(var t=0;t<o.length;t++)o[t](e)}var u={NONE:0,SIZE1COLUMN:1,SIZE2COLUMN:2,SIZE3COLUMN:4,SIZE4COLUMN:8,SIZE12COLUMN:3,SIZE23COLUMN:6,SIZE34COLUMN:12,SIZE234COLUMN:14,SIZE1ROW:256,SIZE1ROWSIZE1COLUMN:257,SIZE1ROWSIZE2COLUMN:258,SIZE1ROWSIZE3COLUMN:260,SIZE1ROWSIZE4COLUMN:264,SIZE2ROW:512,SIZE2ROWSIZE1COLUMN:513,SIZE2ROWSIZE2COLUMN:514,SIZE2ROWSIZE3COLUMN:516,SIZE2ROWSIZE4COLUMN:520,ALL:783},o=[],h=[],e=n.isMobile?u.SIZE1ROWSIZE1COLUMN:u.SIZE2ROWSIZE4COLUMN;f(t.size1rowsize1column,u.SIZE1ROWSIZE1COLUMN);f(t.size2rowsize1column,u.SIZE2ROWSIZE1COLUMN);f(t.size1rowsize2column,u.SIZE1ROWSIZE2COLUMN);f(t.size2rowsize2column,u.SIZE2ROWSIZE2COLUMN);f(t.size1rowsize3column,u.SIZE1ROWSIZE3COLUMN);f(t.size2rowsize3column,u.SIZE2ROWSIZE3COLUMN);f(t.size1rowsize4column,u.SIZE1ROWSIZE4COLUMN);f(t.size2rowsize4column,u.SIZE2ROWSIZE4COLUMN);s(e);define("viewAware",{listen:function(n){typeof n=="function"&&(o.push(n),n(e))},views:u,currentView:function(){return e}})}});define("evaluate",function(){return window.JSON&&window.JSON.parse||function(n){return eval("("+n+")")}});define("screenDpiImpl",["window"],function(n){return function(){return n.devicePixelRatio||1}});define("dpi",["screenDpiImpl","headData","measure","deviceGroup","document","window","location"],function(n,t,i,r,u,f,e){var a=t.dpi||1,o={screen:1,detected:t.ddpi,override:t.dpio,forceServerDpi:t.forcedpi||!(typeof navigator.msManipulationViewsEnabled=="undefined"?!0:navigator.msManipulationViewsEnabled),server:a,client:a,dpiMultiplier:1,sizeMultiplier:1,refresh:!1},h,v,s,c,l;if(e.href.indexOf("nodpi=1")==-1&&(o.screen=n(o)),h=r.isMobile?[1.5,2.25,2.4,2.7]:[1,1.4,1.8,2],v=/<link[^>]*rel="stylesheet"[^>]*href="([^"]*)"[^>]*\/>/ig,o.forceServerDpi===!0)t.dpi=t.ddpi;else if(o.server!=o.screen){for(s=0;s<h.length;s++)if(c=h[s],o.screen<=c||s==h.length-1){o.dpiMultiplier=(o.client=c)/o.server;break}o.client!=o.server&&(u.cookie="dpio="+o.client+";path=/",o.refresh&&e.href.indexOf("dpir=1")==-1&&e.href.indexOf("dpio=")==-1&&require(["navigation"],function(n){var t=e.href.replace(/dpio=[\d.]*/,"");t+=(t.indexOf("?")==-1?"?":"&")+"dpir=1";n.navigate(t,!0)}))}return l=parseFloat(i(u.documentElement,"font-size")),l&&(o.sizeMultiplier=l/10/o.client),o});define("escape",["window"],function(n){function r(t){return t!=null&&n.encodeURI(t)||""}function u(t){return t!=null&&n.encodeURIComponent(t)||""}function f(n){return n!=null&&(""+n).replace(t,function(n){return i[n]||""})||""}var t=/["&'\/<>]/g,i={'"':"&quot;","&":"&amp;","'":"&#39;","/":"&#47;","<":"&lt;",">":"&gt;"};return{url:r,urlPart:u,html:f}});define("classList",["document"],function(n){function u(n){return r[n]||(r[n]=new RegExp("(\\s|^)"+n+"(\\s|$)"))}function i(n,t){return n.className?n.className.match(u(t)):!1}function f(n,t){i(n,t)||(n.className+=" "+t)}function o(n,t){i(n,t)?e(n,t):f(n,t)}function e(n,t){i(n,t)&&(n.className=n.className?n.className.replace(u(t)," "):!1)}var r=[],t=n.classList!=undefined;return{add:t?function(n,t){n.classList.add(t)}:f,remove:t?function(n,t){n.classList.remove(t)}:e,toggle:t?function(n,t){n.classList.toggle(t)}:o,contains:t?function(n,t){n.classList.contains(t)}:i}});define("viewport",["mediator","requestAnimationFrame","window","document"],function(n,t,i,r){function kt(){l=at();a=lt();(l!=s||a!=f)&&(u=!0,e=!0)}function g(){return{left:s,right:et,top:f,bottom:ot,width:h,height:c}}function ht(){u&&(s=l||at(),f=a||lt(),l=a=null,!nt&&f>yt&&(nt=!0,setTimeout(function(){define("c.scrolled",1)},ft)));o&&(h=i.innerWidth||r.documentElement.clientWidth,c=i.innerHeight||r.documentElement.clientHeight);(u||o)&&(et=s+h,ot=f+c);u=o=!1}function w(){if(e){pt=new Date;e=!1;var i=o,r=u,l=h,a=c,v=s,y=f;ht();i=i&&(a!=c||l!=h);r=r&&(v!=s||y!=f);i||r?(b||(b=setTimeout(function(){b=0;var t=g();n.pub(tt,t);r&&n.pub(it,t);i&&n.pub(rt,t)},ft)),dt(),setTimeout(w,ut)):t(w)}else t(w)}function dt(){v&&(st=+new Date,y||(y=setTimeout(function t(){y=v=!1;var i=new Date-st;i>d?n.pub(bt,k):y=setTimeout(t,d-i)},d)))}function ct(){u=!0;o=!0;e=!0}function lt(){if(typeof pageYOffset!="undefined")return pageYOffset;var t=r.body,n=r.documentElement;return n=n.clientHeight?n:t,n.scrollTop}function at(){if(typeof i.pageXOffset!="undefined")return i.pageXOffset;var t=r.body,n=r.documentElement;return n=n.clientWidth?n:t,n.scrollLeft}function gt(n){for(var i=null,t;n&&n.nodeName!="BODY"&&n.nodeName!="HTML";){if(t=n.getAttribute(wt),t){t=t.split(";");i={x:parseInt(t[0])||0,y:parseInt(t[1])||0};break}n=n.parentNode}return i}function ni(n,t,i,r){var u=n.getBoundingClientRect();if(!u.top&&!u.right&&!u.bottom&&!u.left)return 0;r||(r=g());var o=r.width*(t||0),s=r.height*(i||0),h={left:-o,right:r.width+o,top:0-s,bottom:r.bottom+s},f={left:u.left,right:u.right,top:u.top,bottom:u.bottom},e=gt(n.parentNode);return e&&(f.left+=e.x,f.right+=e.x,f.top+=e.y,f.bottom+=e.y),ti(h,f)}function ti(n,t){return!(t.left>n.right||t.right<n.left||t.top>n.bottom||t.bottom<n.top)}function vt(n,t){i.addEventListener(n,t,!1)}var e=!0,u=!0,o=!0,l=null,a=null,yt=10,nt,tt="viewport_change",it="viewport_scroll_change",rt="viewport_size_change",ut=parseInt("")||200,ft=50,b,s=0,et=0,f=0,ot=0,h=0,c=0,pt,wt="data-offset",k="",v=!1,y=0,d=1e3,st,bt="ViewabilityUpdatedEvent",p;return ht(),require(["c.dom"],ct),p="c.deferred",require([p],function(){i.setInterval(kt,ut);t(w)}),require([p],ct),vt("resize",function(){v=!0;k="resize";o=!0;e=!0}),vt("scroll",function(){v=!0;k="scroll";u=!0;e=!0}),{getDimensions:function(){return g()},changeEventName:tt,sizeChangeEventName:rt,scrollChangeEventName:it,isInViewport:ni,deferredCanaryName:p}});require(["window"],function(n){n._llic=function(n){require(["imgSrc"],function(t){t.checkLoad(n)})}});define("imgSrc",["viewAware","measure","dpi","evaluate","mediator","viewport","classList","window","document","image","headData","logging","perfMarker"],function(n,t,i,r,u,f,e,o,s,h,c,l){function ai(n,t){var i=n.getAttribute(t);if(i)try{return r(i)}catch(u){l.error("[imgSrc] error evaluating the '"+t+"' attribute: '"+i+"'",u)}}function vi(n,t){var u=!1,i=st(n),r;return i&&i.src&&t&&typeof t.find=="function"&&typeof t.filter=="function"&&(r=t.find("img[data-src]").filter(function(){return this.imgSrcObj&&this.imgSrcObj.loadedSrc==i.src}),r.length&&(i.loadingSrc=i.src,n.imgSrcObj=i,ii(n,i,r[0]),u=!0)),u}function st(n,t){var i=ai(n,ci),f,r,u;if(i){if(f=i.dpi||1,i=i[a]!==t?i[a]:i[v]!==t?i[v]:i["default"],r=typeof i,r=="string")i={src:i};else if(r!="object"||!i)return null;return i.dpi=f,i.src?(u=i.src.indexOf("//"),u>0&&(i.src=i.src.substring(u)),i.src=wi(i.src,ei)):i.src=bt,i}return null}function dt(n,t){var i,r;return n.onload=null,kt&&(i=st(n),i&&(r=kt==2||i.load!="wait"&&i.load!="defer"&&!e.contains(n,"wait")&&!e.contains(n,"defer")&&!n.getAttribute(it)&&gt(n)&&ht(n,i)&&(t||f.isInViewport(n,0,0)),r&&k(n,i,!0))),r}function yi(t){var i=g&&g!=t;g=t;switch(t){case n.views.SIZE1ROWSIZE1COLUMN:a="size1rowsize1column";v="size1column";break;case n.views.SIZE2ROWSIZE1COLUMN:a="size2rowsize1column";v="size1column";break;case n.views.SIZE1ROWSIZE2COLUMN:a="size1rowsize2column";v="size2column";break;case n.views.SIZE2ROWSIZE2COLUMN:a="size2rowsize2column";v="size2column";break;case n.views.SIZE1ROWSIZE3COLUMN:a="size1rowsize3column";v="size3column";break;case n.views.SIZE2ROWSIZE3COLUMN:a="size2rowsize3column";v="size3column";break;case n.views.SIZE1ROWSIZE4COLUMN:a="size1rowsize4column";v="size4column";break;default:a="size2rowsize4column";v="size4column"}i&&b()}function pi(n){return(n||s).getElementsByTagName("img")}function b(n){var o,u,i;if(ot)for(o=0,u=pi(n),i=0;i<u.length;i++){var t=u[i],r=ri(t),s=r&&r.load!="wait"&&!e.contains(t,"wait")&&!t.getAttribute(it)&&ht(t,r)&&(e.contains(t,"defer")||gt(t)&&f.isInViewport(t,si,hi));s&&(o++,k(t,r))}}function gt(n){do{if(t(n,"display")=="none")return!1;n=n.parentNode}while(n&&n.nodeName!="BODY");return!0}function wi(n,t){var i=n.match(li);return i&&i[y]!=t?n.replace(i[0],i[0].replace(i[y],t)):n}function bi(n,t){var r=n.match(pt),u,i,f;return r&&(u=r[y]*t+.5|0,n=n.replace(r[0],r[0].replace(r[y],u))),i=n.match(wt),i&&(f=i[y]*t+.5|0,n=n.replace(i[0],i[0].replace(i[y],f))),n}function ki(){tt=clearTimeout(tt)}function ni(){tt=setTimeout(function(){var t,n;for(ct=!0,t=0;t<p.length;t++)n=p[t],n.showFn&&(n.showFn(),n.showFn=null,n.shown=!0)},oi)}function ti(n,t,i){var u=n.imgSrcObj,f,e,o,r;if(i.src==u.loadingSrc){if(ct||u.shown){t();return}for(u.showFn=t,f=0;f<u.id;f++)if(e=p[f],e.isInViewport&&!e.shown){if(e.loadingSrc.load!=u.loadingSrc.load)continue;ni();return}for(o=u.id;o<p.length;o++)if(r=p[o],!r.shown&&r.isInViewport)if(r.showFn)ki(),r.showFn(),r.showFn=null,r.shown=!0;else{ni();return}}}function di(n,t,i){var r=d(n);t.src==r.loadingSrc&&(t.lowq&&i.loadingSrc==t.lowq?(t.lowqLoaded=!0,e.remove(n,at),k(n,t)):(n.src=t.src,e.remove(n,ft),e.remove(n,et),e.add(n,ut)))}function ii(n,t,r){var u=d(n);t.src==u.loadingSrc&&(u.loadedSrc=t.src,n.width=r.width*i.sizeMultiplier+.5|0,n.removeAttribute("height"),n.src=r.src,t.lowq&&r.loadingSrc==t.lowq?(t.lowqLoaded=!0,e.remove(n,at),k(n,t)):(e.add(n,et),e.remove(n,ut),e.remove(n,ft)))}function ht(n,t){if(!t||!t.src)return!1;var i=d(n);return i.loadedSrc!=t.src&&t.src!=i.loadingSrc}function ri(n,t){if(!n)return null;if(t)t.src||(t={src:t});else{if(t=st(n),!t)return null;var r=t.dpi||1;r!=i.client&&(t.src=bi(t.src,i.client/r))}return t}function ui(n,t){n&&(t=ri(n,t),ht(n,t)&&k(n,t))}function d(n){var t=n.imgSrcObj;return t||n.nodeName!="IMG"||(t={img:n,id:p.length},n.imgSrcObj=t,p[n.imgSrcObj.id]=t),t}function k(n,t){var r=d(n,t),u,i;r.isInViewport===undefined&&(r.isInViewport=!0);r.loadingSrc=t.src;t.w&&t.h?n.setAttribute(rt,"width:"+t.w+"rem;height:"+t.h+"rem;"):n.hasAttribute(rt)&&n.removeAttribute(rt);e.add(n,ft);e.remove(n,et);e.remove(n,ut);u=(t.lowqLoaded?null:t.lowq)||t.src;i=new h;i.onload=function(){i.onload=null;i.onerror=null;ti(n,function(){ii(n,t,i)},t)};i.onerror=function(){i.onload=null;i.onerror=null;ti(n,function(){di(n,t,i)},t)};i.src=i.loadingSrc=u}var g,a,v,nt=(c.clientSettings||{}).imgsrc||{},ei=nt.quality_high||60,gi=nt.quality_low||5,oi=nt.order_timeout||1e3,si=1,hi=1,ct=!1,tt,lt=100*i.client,it="data-noupdate",ci="data-src",rt="style",ut="err",ft="loading",et="loaded",at="lowq",vt=function(){return 10},yt=function(){return 10},p=[],y=2,pt=/([?&]w=|_w)(\d+)/,wt=/([?&]h=|_h)(\d+)/,li=/([?&]q=|_q)(\d+)/,bt="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAEALAAAAAABAAEAAAIBTAA7",kt={all:0,auto:1,none:2}[(location.search.match(/[?&]llibf=([^&#]+)/i)||[])[1]]||1,w,ot;return o._llic=dt,w=f.getDimensions(),n.listen(yi),ot=!1,require(["c.deferred"],function(){ot=!0;u.sub(f.changeEventName,function(n){var t=Math.abs(n.left-w.left+n.width-w.width),i=Math.abs(n.top-w.top+n.height-w.height);(t>vt()||i>yt())&&(vt=function(){return n.width/4},yt=function(){return n.height/4},w=n,b())});b()}),o.loadDeferredImages=b,{go:ui,reset:ui,noUpdate:it,data:bt,checkLoad:dt,isInViewport:f.isInViewport,loadInViewport:b,dataOffsetAttr:"data-offset",force:vi}});define("imageLoad",["imgSrc","classList","document","pageTime","window"],function(n,t,i,r,u){function a(){c();n.isInViewport?y():f(i.querySelectorAll("main img[data-src]"),s)}function v(n,t){typeof n=="string"&&(n=i.querySelector(n));c(n);o(n,t)}function s(n){var i;!n||n.src&&(t.contains(n,"loaded")||t.contains(n,"loading"))||l(n,i)&&n.setAttribute("data-initial-set","true")}function y(){function u(i){var u=!1,f;return!t.contains(i,"mestripeouter")&&i.querySelector("img[data-src]")&&(f=n.isInViewport(i,0,0),f?(r=!0,o(i)):r&&(u=!0)),u}var r;h(i.getElementById("precontent"));f((i.getElementById("main")||{}).childNodes,u);h(i.getElementById("aside"))}function h(t){var i=!1;return t&&t.querySelector("img[data-src]")&&n.isInViewport(t,0,0)&&(i=!0,o(t)),i}function c(n){e(".ip .swipenav>li:first-child+li img,.carousel .slides li+li img","defer",n);e(".sip .swipenav>li:first-child+li img,.carousel .slides li+li img","defer",n);e(".ip .swipenav>li+li+li img","wait",n);e(".sip .swipenav>li+li+li img","wait",n)}function f(n,t){var i,r;if(n&&n.length)for(i=0;r=n[i];++i)if(r.nodeType==1&&t(r))break}function e(n,r,u){f((u||i).querySelectorAll(n),function(n){t.add(n,r)})}function o(n,t){f(n.querySelectorAll("img[data-src]"),function(n){s(n,t)})}var l=n.checkLoad||u._llic;return{cleanup:a,module:v}});define("adCommon",["document","pageTime","classList","viewAware"],function(n,t,i,r){function e(n,t,i){n&&t&&i!==null&&typeof i!=undefined&&(n[t]=i)}function u(t,i){return i&&i.forcefulVisibilityInEffect?i.forceVisibilityOn:i&&i.options&&i.options.scrollInit?t&&(t.top||t.bottom||t.left||t.right)&&t.top<=(window.innerHeight||n.documentElement.clientHeight)&&t.bottom>=0&&t.left<=(window.innerWidth||n.documentElement.clientWidth)&&t.right>=0:!0}function o(t,r,u,f,e){var o=e||((n.getElementById(t)||{}).parentNode||{}).parentNode,s,h;o&&(((o.querySelector(".adchoices,.adchoicesjs")||{}).style||{}).display=f?"block":"none",r)&&(s=i.contains(o,"widead"),u||s)&&(o.style.display="",o.style.visibility="visible",s&&(h=o.querySelector(".outeradcontainer"),h&&(h.style.display="inline-block")))}function s(n,i,r,u){if(n&&i){var f=t();n[i]||(n[i]={});r?n[i].st=f:(n[i].en=f,u&&(n[i].r=u))}}function h(n,t){n&&(n.forcefulVisibilityInEffect||(n.clientRect=n.elem.getBoundingClientRect()),n.isVisible=u(n.clientRect,n),n.canBeDisplayed=f(n,t)&&!n.shouldHideAds,n.canBeDisplayed|=n.forceDisplayOn||n.canBeDisplayed)}function f(n,t){return t=t||r.currentView(),!!(t&n.allowedViews)}return{isPlacementVisible:u,setAdContainerDisplayState:o,updateElementData:e,isAllowedInView:f,recordTiming:s,checkAndSetAdVisibility:h}});define("dap",["viewAware","document","adCommon","dapmgr","evaluate","classList","viewport","pageTime"],function(n,t,i,r,u,f,e){function h(h,b,ft,et,ot,st){function ri(){var r=st&&st.forcefulVisibility,u=st&&st.forcefulDisplay,e=r===!0,o=u===!0,t,i,n;(s==undefined&&(s=st&&st.adaptiveRefresh===!0,s&&typeof st.adaptiveRefreshInterval=="number"&&(k=st.adaptiveRefreshInterval),s=!0),t=lt&&lt.parentNode&&lt.parentNode.parentNode,i=rt,t)&&(f.contains(t,"widead")?i=it:f.contains(t,"groupad")&&(i=ut),n=w[et],typeof n!="number"&&(n=nt++,w[et]=n),ht={params:h,width:b,height:ft,htmlid:et,options:st||{},allowedViews:oi(),sizeCharacteristics:{},clientRect:lt.getBoundingClientRect(),isRendered:!1,isLoaded:!1,isVisible:!1,canBeDisplayed:!1,forcefulDisplayInEffect:o||u===!1,forceDisplayOn:o,forcefulVisibilityInEffect:e||r===!1,forceVisibilityOn:e,canDisplayAdChoices:!1,isMonitored:!1,elem:lt,adType:i,idx:y.length,telemetry:{},currentRefreshCount:n,friendlyId:"",pg:"",shouldHideAds:bt,completionCb:ai},ht.friendlyId=ht.htmlid.substr(0,tt)+"_"+ht.idx,ht.pg=hi(h),y.push(ht),ui(),si())}function ui(){o?(o.sub(e.scrollChangeEventName,at),o.sub("adrefresh",ti)):require(["mediator"],function(n){o=n;o.sub(e.scrollChangeEventName,at);st.enableAdRefresh&&o.sub("adrefresh",ti)})}function fi(){o?o.sub(e.scrollChangeEventName,at):require(["mediator"],function(n){o=n;o.sub(e.scrollChangeEventName,at)})}function gt(){o?o.unsub(e.scrollChangeEventName,at):require(["mediator"],function(n){o=n;o.unsub(e.scrollChangeEventName,at)})}function at(){vt()}function ei(){require(["adDetection"],function(n){ht.detectionObject=n(ht);ht.detectionObject.startDetection()})}function vt(){!ht||pt||ht.isRendered||(i.checkAndSetAdVisibility(ht,ct),i.setAdContainerDisplayState(ht.htmlid,ht.isVisible,ht.canBeDisplayed||ht.isRendered,ht.canDisplayAdChoices),ht.isVisible&&ht.canBeDisplayed)&&(r.sandboxOptions=ht.options.sandbox,r.useXDomainIframe=ht.options.useXDomainFrame,i.recordTiming(ht.telemetry,"dap",!0,null),r.renderAd(ht.htmlid,ht.params,ht.width,ht.height,!1,ht),i.recordTiming(ht.telemetry,"dap",!1,""),++l,ht.isRendered=!0,r.useXDomainIframe||ei(),gt(),c||(dt(),a=ni()),wt())}function ni(){var t=n.views;return ct&t.SIZE1COLUMN&&1||ct&t.SIZE2COLUMN&&2||ct&t.SIZE3COLUMN&&3||ct&t.SIZE4COLUMN&&4||0}function oi(){var t,i;return lt&&(t=lt.getAttribute("data-adjs"),i=u(t).allowedViews,t)?n.views[i]||n.views.NONE:null}function si(){ht&&vt()}function hi(n){return(ii.exec(n)||{})[1]||""}function wt(){var n='{"w":'+v+',"h":'+p+',"c":'+a+',"v":'+(ht.isVisible?1:0)+',"d":'+(ht.canBeDisplayed?1:0)+',"r":'+(ht.isRendered?1:0)+',"s":'+yt+"}";ht.elem.setAttribute("data-ad",n)}function dt(){var n=e.getDimensions(),i;c&&c.width==n.width||(c=n,i=t.getElementById(d),v=i?i.offsetWidth:n.width,p=n.height)}function ti(){li();typeof ht.order=="number"?setTimeout(function(){vt()},ht.order):vt()}function ci(){var n=ht.elem.querySelector("iframe");n&&(n.src="about:blank");ht.elem.innerHTML=""}function li(){ci();ht.isRendered=!1;ht.isLoaded=!1;ht.isVisible=!1;ht.canBeDisplayed=!1;ht.canDisplayAdChoices=!1;ht.sizeCharacteristics.adSizeType=g;gt();fi()}function ai(){ht.isLoaded||(ht.isLoaded=!0,s?setTimeout(function(){--l},k):--l)}var ht,ct,yt,bt=!1,pt=!1,ii=/\bPG=([^&]*)/i,lt=t.getElementById(et),kt;(pt=st&&st.disableAds===!0,kt=st&&st.disableAdPlacement,bt|=pt,(bt||kt)&&(i.setAdContainerDisplayState(et,!0,!1,!1),pt||kt))||(n.listen(function(n){(ct=ct||n,ct!=n)&&(ct=n,a=ni(),dt(),wt(),vt())}),ri(),require(["scaledView"],function(n){yt=n.isScaled();wt();n.addListener(function(n){yt!=n&&(dt(),yt=n,wt())})}))}var a,c,v,p,d="header-common",g=0,o;r.enableUnblockingOnload&&r.enableUnblockingOnload(!0);var y=[],w={},nt=0,tt=15,l=0,b=!1,it=0,rt=2,ut=3,k,s;return h.adPlacements=y,h.adLoadedEvent="adloaded",h.adRerenderedEvent="adrerendered",h.refresh=function(){require(["adRefresh"],function(n){s&&(b=l>0);n.refresh(b)})},h});var c="c.dom";require(["jquery","imgSrc","mediator",c],function(n,t,i){function r(){n("#main").children().addClass("loaded");t.loadInViewport(n("#main")[0]);i.pub("revealLoaded")}r()});define("autoSizeFlex",["jquery","jqBehavior","mediator","pixelToRem","dir.tokens"],function(n,t,i,r,u){function f(n){function e(){var i;(t=n.children(":visible").last(),f.length&&t.length)&&(i=u.ltr?t.offset().left-n.offset().left+t.outerWidth():f.offset().left-t.offset().left+f.outerWidth(!0),n.width(r(i)+"rem"))}var t,f=n.children().first();return i.sub("tabChanged",e),{setup:e,update:e}}return t(f)});require(["binding","c.dom"],function(n){n("autoSizeFlex",".autosizeflex").all()});define("allPageBindings",function(){return function(n){var t=function(t){t(n)};require(["pageBindings"],t);require(["pageBindings.pc"],t);require(["pageBindings.pc-!ms.ie10plus"],t)}});require(["allPageBindings"],function(n){n("html")});define("navigation",["escape","location"],function(n,t){function r(n,t,i){var s=function(n){return n=n.replace(/\+/g," "),decodeURIComponent(n)},u={},o,e;if(n)for(n=n.split("#")[0],o=n.split("&"),e=0;e<o.length;e++){var h=o[e].split("="),r=h[0],f=h[1];i&&(r=s(r),f&&(f=s(f)));t?(u[r]||(u[r]=[]),u[r].push(f)):u[r]=f}return u}function u(n){var t=f.exec(n);return t?t[2]:!1}var f=/[a-z][a-z0-9+\-.]*:\/\/([a-z0-9\-._~%!$&'()*+,;=]+@@)?([a-z0-9\-._~%]+|\[[a-z0-9\-._~%!$&'()*+,;=:]+\])/i,i={getUrl:function(n){return i.filter?i.filter(n):n},navigate:function(n,r){i.filter&&(n=i.filter(n));r?t.replace(n):t.href=n},getHostName:u,isLocal:function(n){var i=u(n);return!i||t.hostname==i},getParams:r,getParamsFromUrl:function(n,t,i){var u=n.split("?")[1];return r(u,t,i)},mergeQueryStringParams:function(t,i){var e,f,o,u;if(i){if(e=t.split("?"),e[1]){f=r(e[1],!1,!0);for(u in i)f[u]=i[u]}else f=i;t=e[0];o="?";for(u in f)t+=f[u]?o+n.urlPart(u)+"="+n.urlPart(f[u]):o+n.urlPart(u),o="&"}return t},filter:null};return i});require(["logging","measure","document","c.onload"],function(n,t,i){var r=t(i.getElementsByTagName("head")[0]),u=r("boxSizing");u!="border-box"&&n.fatalError("C5001 Css was not loaded correctly.")});define("logging",["navigation","headData","requestAnimationFrame","window","document","pageTime","escape"],function(n,t,i,r,u,f,e){function rt(n,t){if(n.addEventListener)n.addEventListener("error",t,!1);else if(n.onerror){var i=n.onerror;n.onerror=function(n,r,u,f,e){return i(n,r,u,f,e),t(n,r,u,f,e)}}else n.onerror=t}function ut(){if(!o&&(o=n.getUrl(t.clientSettings.base_url+"_log"),!/[?&]fdhead=[^&#]*/i.test(o))){var i=(/\bf\:([^;]*)/.exec(u.getElementsByTagName("head")[0].getAttribute("data-info"))||{})[1]||"";i&&(o+=(o.indexOf("?")>0?"&":"?")+"fdhead="+i)}return o}function g(){c&&k&&!p&&(p=setTimeout(function(){(p=0,s.length)&&(d.ajax({type:"POST",url:ut(),data:{aid:t.clientSettings.aid,v:t.clientSettings.v,messages:s},error:function(n,t,i){a("error","[506] Could not log: "+n+" - "+t+" "+i);c=!1}}),s=[])},2e3))}function l(n,t){return(t==b&&n.indexOf("Script error")>=0&&(t=h),t==h)?"warn":t==y?"info":(c&&(s.push({m:e.urlPart(n),t:t,d:f()}),g()),t==y?"info":t==h?"warn":"error")}function a(n,t,i){if(r.console){if(!i&&n=="info")return;if(!i&&n=="warn")return;var u=console[n];u&&typeof u=="function"?console[n](t):console.log&&console.log(t)}}function v(n){var r=[],t,i;if(n)for(t=0;t<n.length;++t)i=nt(n[t]),i&&r.push(i);return r.join(", ")}function nt(n,t,i,u,f){var o=(n==null||typeof n=="string"?n:n.message||n.description)||"",e,s;return!o&&(n!=null&&(typeof n=="object"&&n.toString()=="[object Event]"?(e=r.event,e&&e.type=="error"&&(o=e.errorMessage,t=e.errorUrl,i=e.errorLine,u=e.errorCharacter)):o=n.toString()),!o)?"":(t=n.url||n.filename||t,i=n.lineno||i,u=n.colno||u,s=n.stack||n.error&&n.error.stack,o.trim()+(f||"")+(i?"\nLine="+i:"")+(u?"\nColumn="+u:"")+(t?"\nScriptUrl="+t:"")+(s?"\nStack="+s:""))}function ft(){var n=v(arguments);l(n,it);i(function(){var i=e.html("http://"+u.location.host),n=e.url(u.location.href);n.indexOf("https://")==0&&(n=n.replace("https://","http://"));u.getElementsByTagName("body")[0].innerHTML="<style>body{font-family:Arial;margin-left:40px}img{border:0 none}#content{margin-left:auto;margin-right:auto}#message h2{font-size:20px;font-weight:normal;color:#000;margin:34px 0 0 0}#message p{font-size:13px;color:#000;margin:7px 0 0 0}#errorref{font-size:11px;color:#737373;margin-top:41px}<\/style><div id='content'><div id='message'><h2>This page is not available right now<\/h2><p>We're working to restore it as soon as possible. Please check back soon.<br/><br/><a href=\""+e.html(n)+'">Click here<\/a> to try this page again, or visit: <a href="'+i+'">'+i+"<\/a><\/p><\/div><div id='errorref'><span>Ref 1: "+e.html(t.clientSettings.aid)+"&nbsp;&nbsp;&nbsp;Ref 2: "+e.html(t.clientSettings.sid||"000000")+"&nbsp;&nbsp;&nbsp;Ref 3: "+e.html(new Date)+"<\/span><\/div><\/div>"})}function tt(){var n=v(arguments);a(l(n,b),n,!0)}function et(){var n=v(arguments);a(l(n,h),n)}function ot(){var n=v(arguments);a(l(n,y),n)}function st(n){(r.console||{}).timeStamp?console.timeStamp(n):(r.performance||{}).mark&&r.performance.mark(n)}var w=0,it=-1,b=0,h=1,y=2,s=[],p,k,d,o,c=Math.random()*100<=10;return rt(r,function(n,t,i,r){return w++,n=nt(n,t,i,r," [ENDMESSAGE]"),n&&tt("[SCRIPTERROR] "+n),!0}),c&&require(["jquery","c.deferred"],function(n){k=!0;d=n;s.length&&g()}),{error:tt,fatalError:ft,unhandledErrorCount:function(){return w},perfMark:st,warning:et,information:ot}});require(["viewAwareInit"],function(n){n({size2row:"(min-height: 48.75em)",size1row:"(max-height: 48.74em)",size4column:"(min-width: 79em)",size3column:"(min-width: 58.875em) and (max-width: 78.99em)",size2column:"(min-width: 43.75em) and (max-width: 58.865em)",size2rowsize4column:"(min-width: 79em) and (min-height: 48.75em)",size2rowsize3column:"(min-width: 58.875em) and (max-width: 78.99em) and (min-height: 48.75em)",size2rowsize2column:"(max-width: 58.865em) and (min-height: 48.75em)",size1rowsize4column:"(min-width: 79em) and (max-height: 48.74em)",size1rowsize3column:"(min-width: 58.875em) and (max-width: 78.99em) and (max-height: 48.74em)",size1rowsize2column:"(max-width: 58.865em) and (max-height: 48.74em)"})});require(["deviceInit"],function(n){n({AllowTransform3d:"false",AllowTransform2d:"true",RtlScrollLeftAdjustment:"fromLeft",ShowMoveTouchGestures:"true",SupportFixedPosition:"true",UseCustomMatchMedia:null,Viewport_Behavior:"Default",Viewport_Landscape:null,Viewport:"width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no",IsMobileDevice:"false"})})</script><meta property="sharing_url" content="http://www.msn.com/en-us"/><meta property="og:url" content="http://www.msn.com/"/><meta property="og:title" content="MSN.com - Hotmail, Outlook, Skype, Bing, Latest News, Photos &amp; Videos"/><meta property="og:type" content="website"/><meta property="og:site_name" content="MSN"/><meta property="og:image" content="http://static-hp-wus.s-msn.com/sc/c6/519670.jpg"/><meta property="fb:app_id" content="689384617806917"/><link rel="shortcut icon" href="//static-hp-wus.s-msn.com/sc/2b/a5ea21.ico" />    <script>_timing.head = +new Date</script>
-<style>.flthighdensity .popularnow h3::before{display:none}.skypefreoverlay .win10promo{display:none!important}.spartan #main .paging-container.snap{overflow-x:hidden}#main .onenote .meflyout time,#main .office .meflyout time{display:none}#main .poc.topsites li{width:14.2%}#main .simple.poc.topsites a{height:16.5rem;width:16.5rem}.facebook .meflyout>section ul li a span::before{line-height:inherit;top:.25rem;left:1.25rem;position:absolute}.facebook .meflyout>section ul li:nth-child(4) a span::before{top:.5rem}.facebook .meflyout>section ul li a span{position:relative}#addRemoveSectionsModalContainer #addRemoveSectionsModal{display:block}.promobanner.popup .refreshbody{height:auto}.ie8 #maincontent{height:auto !important}.ie8 #content{height:auto !important}.ie8 #main{height:auto !important}.mobile .galleryinfo .img-divider{display:none}.homepage.tmx.pc.chrome #main .one-col,.homepage.tmx.pc.chrome #main .two-col,.homepage.tmx.pc.chrome #main .three-col{margin-right:-.016rem;margin-left:-.016rem}.homepage.midlevel .pagingsection>button.show,.channelplayerpage.midlevel .pagingsection>button.show{display:none}</style>        <script>
-            window._flushTimings && (window._flushTimings.HtmlHeadEnd = new Date - window.performance.timing.navigationStart);
-        </script>
-
-    </head>
-
-    <body class="startpage sp center-content start tmx pc webkit chrome fltmuidflt2cf fltmuidflt9-ismsft fltd-thshldie1 fltd-thshldie2">
-
-    <script>_timing.top = +new Date</script>
-            <script>
-                require(["headData", "pageInstance", "mediator"], function (headData, pageInstance, mediator)
-                {
-                    var url = '//c.msn.com/c.gif?udc=true&rid=cc7227b7f7fe4e3bb644226f3ef2c489&rnd=635834754140845569&rf=&tp=http%253A%252F%252Fwww.msn.com%252F&di=340&lng=en-us&cv.product=prime&pn=startpage&activityId=cc7227b7f7fe4e3bb644226f3ef2c489&d.dgk=tmx.pc.webkit.chrome&d.imd=0';
-                    if (headData && headData.clientSettings && headData.clientSettings.static_page)
-                    {
-                        mediator.pub(pageInstance.eventName);
-                        var rid = pageInstance.getActivityId();
-                        url = url.replace(/([?&]rid=)[^&#]*/i, "$1" + rid);
-                    }
-                    var img = new Image();
-                    img.onload = img.onerror = function ()
-                    {
-                        img.onload = img.onerror = null;
-                    };
-                    img.src = url;
-                });
-            </script>
- <script>
-/*<![CDATA[*/
- require(["track","track.generic","c.track.mobi"],function(t,g,o){t.extend({"sitePage":{"department":"","subDepartment":"","channel":"homepage","pageName":"startpage","autoRefresh":"0","requestId":"cc7227b7f7fe4e3bb644226f3ef2c489","canvas":"Browser","vertical":"homepage","entityId":"","entityCollectionId":"","entitySrc":"","cvAuthor":"","d_dgk":"tmx.pc.webkit.chrome","d_imd":"0","cvPartner":"","cvPublcat":"","provid":"","templ":"infopane:0;cat:0;IP:Cookie;RV:Cookie;EP:0","pageIndex":"","pageTotalCount":"","isStaticPage":"False","pageVersion":"15","contentType":"unknown_use_metadata_to_set_the_content_type","isCorePV":"","chartBeatUID":"42635","chartBeatDomain":"msn.com","chartBeatBase":"http://static.chartbeat.com","otfURL":"//otf.msn.com/c.gif?","flightid":"muidflt2cf,muidflt9-ismsft,d-thshldie1,d-thshldie2","exa":"muidflt2cf,muidflt9-ismsft,d-thshldie1,d-thshldie2","cvProduct":"prime","pageId":"startpage","storeocid":"msn","pageUrl":"http%3A%2F%2Fwww.msn.com%2F","device":"Unknown Unknown","domainId":"340","propertyId":"","propertySpecifier":"","localeCode":"en-us"},"userStatic":{"isSignedIn":"True","beginRequestTicks":"635834754140689253"},"spinTimeOut":151,"enableOOB":1,"oobWaitTime":151});t.register(new g({"base":"//c.msn.com/c.gif?","id":"ctag","disableOnAutoRefresh":"scorecard","isGeneratedEarly":1,"impr":{"param":{'udc': 'true'},"paramMap":{"event":{'evt':'type'},"userDynamic":{'rid':'requestId','rnd':'timeStamp'},"client":{'rf':'referrer','tp':'pageUrl','scr':'screenResolution'},"sitePage":{'di':'domainId','lng':'localeCode','cv.product':'cvProduct','pn':'pageName','activityId':'requestId','d.dgk':'d_dgk','d.imd':'d_imd'}}}}),new g({"base":"http://b.scorecardresearch.com/b?","id":"scorecard","disableOnAutoRefresh":"scorecard","isGeneratedEarly":0,"impr":{"param":{'c1': '2', 'c2': '3000001'},"paramMap":{"userDynamic":{'rn':'timeStamp'},"client":{'c7':'pageUrl','c8':'pageTitle','c9':'referrer'}}},"page_candidate":{"paramMap":{"event":{'evt':'type'},"userDynamic":{'rn':'timeStamp'},"client":{'c7':'pageUrl','c8':'pageTitle','c9':'referrer'}}}}),new g({"base":"//otf.msn.com/c.gif?","id":"udc","disableOnAutoRefresh":"scorecard","commonMap":{"userDynamic":{'rid':'requestId','cts':'timeStamp'},"client":{'clid':'clientId'},"sitePage":{'di':'domainId','mkt':'localeCode','pn':'pageName','su':'pageUrl','pid':'pageId','mv':'pageVersion','cv.product':'cvProduct','flightid':'flightid','exa':'exa','activityId':'requestId','cvs':'canvas','subcvs':'vertical'}},"isGeneratedEarly":0,"impr":{"param":{'evt': 'impr', 'js': '1'},"paramMap":{"userStatic":{'pp':'isSignedIn'},"userDynamic":{'dv.snlogin':'settings','dv.grpfrmod':'defaultSlotTrees'},"client":{'rf':'referrer','cu':'pageUrl','scr':'screenResolution','bh':'height','bw':'width','dv.Title1':'pageTitle','viewType':'viewType','e1':'OTFTelemetry','prs':'personalization'},"sitePage":{'st.dpt':'department','st.sdpt':'subDepartment','cv.partner':'cvPartner','cv.publcat':'cvPublcat','cv.author':'cvAuthor','CndEl':'conditionalItem','cv.entityId':'entityId','cv.entitySrc':'entitySrc','cv.parentId':'entityCollectionId','provid':'provid','ar':'autoRefresh','d.dgk':'d_dgk','d.imd':'d_imd','tmpl':'templ','isStaticPage':'isStaticPage','pgIdx':'pageIndex','pgTot':'pageTotalCount'}}},"click":{"paramMap":{"event":{'evt':'type'},"userDynamic":{'aop':'AOP','region':'Region','slidetype':'slideType','eventIndex':'eventNumber'},"client":{'gesture':'gesture','viewType':'viewType'},"sitePage":{'cv.product':'cvProduct'},"report":{'ce':'contentElement','cm':'contentModule','hl':'headline','du':'destinationUrl','e1':'module','l':'nLineage','lo':'oLineage'}}},"page_candidate":{"paramMap":{"event":{'evt':'type'}}},"unload":{"paramMap":{"event":{'evt':'type'}}},"app_error":{"paramMap":{"event":{'evt':'type'},"report":{'errId':'errId','errMsg':'errMsg','errSource':'errSource'}}}}));t.trackPage();})
-//]]>
-</script>
- <noscript>
- <img src="//c.msn.com/c.gif?udc=true&amp;rid=cc7227b7f7fe4e3bb644226f3ef2c489&amp;rnd=635834754140845569&amp;rf=&amp;tp=http%253A%252F%252Fwww.msn.com%252F&amp;di=340&amp;lng=en-us&amp;cv.product=prime&amp;pn=startpage&amp;activityId=cc7227b7f7fe4e3bb644226f3ef2c489&amp;d.dgk=tmx.pc.webkit.chrome&amp;d.imd=0" alt="image beacon" width="1" height="1" /><img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=3000001&amp;rn=635834754140845569&amp;c7=http%253A%252F%252Fwww.msn.com%252F&amp;c8=&amp;c9=" alt="image beacon" width="1" height="1" /><img src="//otf.msn.com/c.gif?js=0&amp;evt=impr&amp;di=340&amp;pi=&amp;ps=&amp;su=http%253A%252F%252Fwww.msn.com%252F&amp;pageid=startpage&amp;mkt=en-us&amp;pn=startpage&amp;mv=15&amp;pp=True&amp;cv.product=prime&amp;cv.partner=&amp;cv.publcat=&amp;st.dpt=&amp;st.sdpt=&amp;dv.Title1=&amp;cts=635834754140845569&amp;rf=&amp;rid=cc7227b7f7fe4e3bb644226f3ef2c489&amp;cvs=Browser&amp;subcvs=homepage&amp;cv.entityId=&amp;cv.entitySrc=&amp;provid=&amp;ar=0&amp;d.dgk=tmx.pc.webkit.chrome&amp;d.imd=0&amp;cv.parentId=&amp;isCorePV=&amp;pgIdx=&amp;pgTot=&amp;activityId=cc7227b7f7fe4e3bb644226f3ef2c489" alt="image beacon" width="1" height="1" />
-</noscript>
-
-    <div class="head">
-
-        
-
-
-<header id="header-common"  class="no-overlay" role="banner"  data-region="header"  data-id="1" data-m='{"i":1,"n":"header","y":6}'>
- 
- 
-
-
- <h1>
-<a class="logo" href="/en-us"  data-id="2" data-m='{"i":2,"p":1,"n":"msnlogo","y":14,"l":"homepage","o":1}'>msn  <span class="logohover">refresh page</span>
-</a>
- <a class="vertical" href="/en-us/#tevt=click_nonnav"  data-id="3" data-m='{"i":3,"p":1,"n":"HeaderVerticalLink","y":14,"l":"homepage","o":2}'>msn</a>
-
- </h1>
-
-<ul>
-<li>
- 
-<section id="header-search" role="search"  data-aop="search"  data-id="4" data-m='{"i":4,"p":1,"n":"headersearch","y":9,"o":3}'>
-<form action="http://www.bing.com/search?scope=web" method="get" id="srchfrm" target="_blank" data-form-code="PRUSEN"   data-bing-action-uri="http://www.bing.com/search?scope=web">
- 
-
- <button id="sb_form_go" class="text"  title="web search">web search</button>
-
-<button type="button" name="bingSearch" class="image"  title="web search"></button>
-<div class="qc">
-<input id="q" name="q" tabindex="1" accesskey="S" autocomplete="off" type="search" value="" maxlength="250"
-
-  aria-label="Search:"
- 
-  data-id="5" data-m='{"i":5,"p":4,"n":"searchinput","y":9,"o":1}'>
-
-                <script>require(["perfMarker"], function (perfMarker) { var q = document.getElementById("q"); if (q) { q.focus(); perfMarker("TimeToFirstSearchInteractive", true) } })</script>
- </div>
-<input type="hidden" name="form" value="PRUSEN"  data-id="6" data-m='{"i":6,"p":4,"n":"search_formcode","y":9,"l":"PRUSEN","o":2}'>
-   <input type="hidden" name="mkt" value="en-us"  data-id="7" data-m='{"i":7,"p":4,"n":"search_locale","y":9,"l":"en-us","o":3}'>
-  <input type="hidden" name="refig" value="cc7227b7f7fe4e3bb644226f3ef2c489">
-</form>
-<button type="button" id="sb"></button>
- 
-</section>
-</li>
- <li>
-  <ul id="user-profile"  data-sso-dependent="true" data-module-id="startpage|start.header|header|header-signin|signin" data-dhp_cookie_days="0"  data-id="8" data-m='{"i":8,"p":1,"n":"header-signin","t":"signin","o":4}'>
- 
-<li id="username">
- <div id="meCtrl"  data-sign-in-url="" data-sign-out-url="http://login.live.com/logout.srf?ct=1447878614&amp;rver=6.1.6195.0&amp;lc=1033&amp;id=1184&amp;lru=https:%2f%2fwww.msn.com%2fen-us%2fhomepage%2fSecure%2fPassport%3fru%3dhttp%253a%252f%252fwww.msn.com%252f&amp;mkt=en-us&amp;pcexp=True" data-me-url="https://login.live.com/me.srf?wa=wsignin1.0&amp;rpsnv=12&amp;ct=1447878613&amp;rver=6.1.6195.0&amp;wp=&amp;wreply=https:%2F%2Fwww.msn.com%2Fen-us%2Fhomepage%2FSecure%2FPassport%3Fru%3Dhttp%253a%252f%252fwww.msn.com%252f%253fpfr%253d1&amp;lc=1033&amp;id=1184&amp;mkt=en-us" data-is-authenticated="True" data-first-name="Ryan" data-last-name="Nowak" data-member-name="ryan.nowak@outlook.com" data-cid="CD3CD40B7E5492D6">
- <a href="http://profile.live.com/" title="Edit profile"  data-id="9" data-m='{"i":9,"p":8,"n":"EditProfileNavigation","y":14,"o":1}'>
-<span class="mectrlname">Ryan</span><span class="mectrlimageplaceholder"></span>
-</a>
- </div>
-</li>
-<li id="settings">
-<a href="#temp"  data-id="10" data-m='{"i":10,"p":8,"n":"settings","y":14,"o":2}'></a>
-  <ul role="menu" aria-hidden="true">
-
- <li>
-<label>Change language &amp; content:</label>
-<select id="site-market"  data-id="11" data-m='{"i":11,"p":8,"n":"changemarket","y":14,"o":3}'>
- <option data-mkt="es-xl" data-mkt-url="http://www.msn.com/es-xl">Am&#233;rica Latina (espa&#241;ol)</option>
- <option data-mkt="es-ar" data-mkt-url="http://www.msn.com/es-ar">Argentina (espa&#241;ol)</option>
- <option data-mkt="en-au" data-mkt-url="http://www.msn.com/en-au">Australia (English)</option>
- <option data-mkt="nl-be" data-mkt-url="http://www.msn.com/nl-be">Belgi&#235; (Nederlands)</option>
- <option data-mkt="fr-be" data-mkt-url="http://www.msn.com/fr-be">Belgique (fran&#231;ais)</option>
- <option data-mkt="pt-br" data-mkt-url="http://www.msn.com/pt-br">Brasil (portugu&#234;s)</option>
- <option data-mkt="en-ca" data-mkt-url="http://www.msn.com/en-ca">Canada (English)</option>
- <option data-mkt="fr-ca" data-mkt-url="http://www.msn.com/fr-ca">Canada (fran&#231;ais)</option>
- <option data-mkt="es-cl" data-mkt-url="http://www.msn.com/es-cl">Chile (espa&#241;ol)</option>
- <option data-mkt="es-co" data-mkt-url="http://www.msn.com/es-co">Colombia (espa&#241;ol)</option>
- <option data-mkt="da-dk" data-mkt-url="http://www.msn.com/da-dk">Danmark (Dansk)</option>
- <option data-mkt="de-de" data-mkt-url="http://www.msn.com/de-de">Deutschland (Deutsch)</option>
- <option data-mkt="es-es" data-mkt-url="http://www.msn.com/es-es">Espa&#241;a (espa&#241;ol)</option>
- <option data-mkt="fr-fr" data-mkt-url="http://www.msn.com/fr-fr">France (fran&#231;ais)</option>
- <option data-mkt="en-in" data-mkt-url="http://www.msn.com/en-in">India (English)</option>
- <option data-mkt="id-id" data-mkt-url="http://u.msn.com/id-id">Indonesia (Bahasa Indonesia)</option>
- <option data-mkt="en-ie" data-mkt-url="http://www.msn.com/en-ie">Ireland (English)</option>
- <option data-mkt="it-it" data-mkt-url="http://www.msn.com/it-it">Italia (italiano)</option>
- <option data-mkt="en-my" data-mkt-url="http://www.msn.com/en-my">Malaysia (English)</option>
- <option data-mkt="es-mx" data-mkt-url="http://prodigy.msn.com/es-mx">M&#233;xico (espa&#241;ol)</option>
- <option data-mkt="nl-nl" data-mkt-url="http://www.msn.com/nl-nl">Nederland (Nederlands)</option>
- <option data-mkt="en-nz" data-mkt-url="http://www.msn.com/en-nz">New Zealand (English)</option>
- <option data-mkt="nb-no" data-mkt-url="http://www.msn.com/nb-no">Norge (norsk, bokm&#229;l)</option>
- <option data-mkt="de-at" data-mkt-url="http://www.msn.com/de-at">&#214;sterreich (Deutsch)</option>
- <option data-mkt="es-pe" data-mkt-url="http://www.msn.com/es-pe">Per&#250; (espa&#241;ol)</option>
- <option data-mkt="en-ph" data-mkt-url="http://www.msn.com/en-ph">Philippines (English)</option>
- <option data-mkt="pl-pl" data-mkt-url="http://www.msn.com/pl-pl">Polska (polski)</option>
- <option data-mkt="pt-pt" data-mkt-url="http://www.msn.com/pt-pt">Portugal (Portugu&#234;s)</option>
- <option data-mkt="de-ch" data-mkt-url="http://www.msn.com/de-ch">Schweiz (Deutsch)</option>
- <option data-mkt="en-sg" data-mkt-url="http://www.msn.com/en-sg">Singapore (English)</option>
- <option data-mkt="en-za" data-mkt-url="http://www.msn.com/en-za">South Africa (English)</option>
- <option data-mkt="fr-ch" data-mkt-url="http://www.msn.com/fr-ch">Suisse (fran&#231;ais)</option>
- <option data-mkt="fi-fi" data-mkt-url="http://www.msn.com/fi-fi">Suomi (suomi)</option>
- <option data-mkt="sv-se" data-mkt-url="http://www.msn.com/sv-se">Sverige (svenska)</option>
- <option data-mkt="tr-tr" data-mkt-url="http://www.msn.com/tr-tr">T&#252;rkiye (T&#252;rk&#231;e)</option>
- <option data-mkt="en-ae" data-mkt-url="http://www.msn.com/en-ae">United Arab Emirates (English)</option>
- <option data-mkt="en-gb" data-mkt-url="http://www.msn.com/en-gb">United Kingdom (English)</option>
- <option data-mkt="en-us" data-mkt-url="http://www.msn.com/en-us" selected>United States (English)</option>
- <option data-mkt="es-us" data-mkt-url="http://www.msn.com/es-us">United States (espa&#241;ol)</option>
- <option data-mkt="es-ve" data-mkt-url="http://www.msn.com/es-ve">Venezuela (espa&#241;ol)</option>
- <option data-mkt="vi-vn" data-mkt-url="http://www.msn.com/vi-vn">Vi&#234;?t Nam (Ti&#234;?ng Vi&#234;?t)</option>
- <option data-mkt="el-gr" data-mkt-url="http://www.msn.com/el-gr">????da (e???????)</option>
- <option data-mkt="ru-ru" data-mkt-url="http://www.msn.com/ru-ru">?????? (P??????)</option>
- <option data-mkt="he-il" data-mkt-url="http://www.msn.com/he-il">????? (?????)?</option>
- <option data-mkt="ar-ae" data-mkt-url="http://www.msn.com/ar-ae">???????? ??????? ??????? (????????)</option>
- <option data-mkt="ar-sa" data-mkt-url="http://www.msn.com/ar-sa">??????? ??????? ???????? (????????)</option>
- <option data-mkt="ar-eg" data-mkt-url="http://www.msn.com/ar-eg">??? (????????)</option>
- <option data-mkt="th-th" data-mkt-url="http://www.msn.com/th-th">??? (???)</option>
- <option data-mkt="ko-kr" data-mkt-url="http://www.msn.com/ko-kr">?? (???)</option>
- <option data-mkt="zh-cn" data-mkt-url="http://cn.msn.com/">??????? (????)</option>
- <option data-mkt="zh-tw" data-mkt-url="http://www.msn.com/zh-tw">?? (????)</option>
- <option data-mkt="ja-jp" data-mkt-url="http://www.msn.com/ja-jp">?? (???)</option>
- <option data-mkt="zh-hk" data-mkt-url="http://www.msn.com/zh-hk">??????? (????)</option>
- </select>
-</li>
-
- <li class="marketswitch" data-mkt="es-us" data-mkt-url="http://www.msn.com/es-us"  data-id="12" data-m='{"i":12,"p":8,"n":"marketswitch","y":14,"o":4}'>
-<span>Switch to Latino</span>
-</li>
-
- <li>
-<a href="/en-us/settings"  data-id="13" data-m='{"i":13,"p":8,"n":"","y":14,"l":"settings","o":5}'>
- Settings
-</a>
-</li>
-
-
- <li class="global">
-<button class="personalization"  data-id="14" data-m='{"i":14,"p":8,"n":"personalization","y":11,"o":6}'>Customize this page</button>
-</li>
-
- <li >
-<a id="makehomepage" target="_blank" href="http://www.myhomemsn.com/?form=MDBMDF&amp;publ=MSNHPG&amp;crea=TEXT_MDBMDF_DHP_DHP_static_1x1"  data-id="15" data-m='{"i":15,"p":8,"n":"homepagelink","y":14,"l":"homepage","o":7}'>Make MSN my homepage</a>
-</li>
-
- <li class=feedback>
-
-<a href="#" id="usermenu-feedback"  data-id="16" data-m='{"i":16,"p":8,"n":"feedback","y":14,"o":8}'>
- Feedback
-</a>
-</li>
- <li>
-<a target="_blank" href="https://support.microsoft.com/product/msn/msn"  data-id="17" data-m='{"i":17,"p":8,"n":"helpLink","y":14,"l":"homepage","o":9}'>Help</a>
-</li>
- </ul>
-
-</li>
- 
-</ul>
-
-
-
-
-
- 
-</li>
-  </ul>
- 
-</header>
-<div class="search-overlay"  data-aop="search-overlay"></div>
-
-        
-
-        
-    </div>
-
-    <div id="precontent"  data-region="precontent"  data-id="18" data-m='{"i":18,"n":"precontent","y":6}'>
-        
-        
-
-        
-        
-    </div>
-
-<div id="mestripebg"></div>
-        <script>
-            window._flushTimings && (window._flushTimings.PreContentEnd = new Date - window.performance.timing.navigationStart);
-        </script>
-
-
-    <div id="maincontent">
-    <div class="content" id="content">
-    <main id="main" role="main"  data-region="main"  data-id="19" data-m='{"i":19,"n":"main","y":6}'>
-
-
-  <div class="stripeouter mestripeouter"  data-aop="mestripe_mestripe"  data-id="20" data-m='{"i":20,"p":19,"n":"meStripe","t":"meStripe","o":1}'  data-section-id="mestripe">
- 
-<div class="mestripescrollfix">
-<button class="stripearrow"  data-aop="leftarrow"  data-id="21" data-m='{"i":21,"p":20,"n":"leftarrow","y":12,"o":1}'></button>
-
-<div class="mestripe" >
-  <ul >
- <li  class="mail"   data-aop="mestripe.mail_me"  data-id="22" data-m='{"i":22,"p":20,"n":"meStripe.mail","t":"me","o":2}'>
- <a href="http://outlook.com/" target="_blank" data-piitxt="mail" piiurl="http://outlook.com/">
-<h3>Outlook.com<span></span></h3>
-</a>
- </li>
- <li  class="store"   data-aop="mestripe.store_mestore"  data-id="23" data-m='{"i":23,"p":20,"n":"meStripe.store","t":"meStore","o":3}'>
- <a href="http://clk.tradedoubler.com/click?p=261853&amp;a=2529304&amp;g=0&amp;epi=Prime_WW_HP_MEstoreL1&amp;url=http://www.microsoftstore.com?icid=MSN_storeTILE" target="_blank" data-piitxt="store" piiurl="http://clk.tradedoubler.com/click?p=261853&amp;a=2529304&amp;g=0&amp;epi=Prime_WW_HP_MEstoreL1&amp;url=http://www.microsoftstore.com?icid=MSN_storeTILE">
-<h3>Store<span></span></h3>
-</a>
- </li>
- <li  class="integratedskype"  data-abchenabled="true" data-module-id="startpage|meStripe|meStripe|meStripe.integratedSkype|meIntegratedSkype"  data-aop="mestripe.integratedskype_meintegratedskype"  data-id="24" data-m='{"i":24,"p":20,"n":"meStripe.integratedSkype","t":"meIntegratedSkype","o":4}'>
- <a href="http://www.skype.com/" target="_blank" data-piitxt="integratedskype" piiurl="http://www.skype.com/">
-<h3>Skype<span></span></h3>
-</a>
- </li>
- <li  class="bingrewards"  data-module-id="startpage|meStripe|meStripe|meStripe.mebingrewards|meBingRewards"  data-aop="mestripe.mebingrewards_mebingrewards"  data-id="25" data-m='{"i":25,"p":20,"n":"meStripe.mebingrewards","t":"meBingRewards","o":5}'>
- <a href="https://www.bing.com/rewards/dashboard" target="_blank" data-piitxt="bingrewards" piiurl="https://www.bing.com/rewards/dashboard">
-<h3>Rewards<span></span></h3>
-</a>
- </li>
- <li  class="office"   data-aop="mestripe.office_meoffice"  data-id="26" data-m='{"i":26,"p":20,"n":"meStripe.office","t":"meOffice","o":6}'>
- <a href="https://www.office.com/?WT.mc_id=MSN_site" target="_blank" data-piitxt="office" piiurl="https://www.office.com/?WT.mc_id=MSN_site">
-<h3>Office<span></span></h3>
-</a>
- </li>
- <li  class="onenote"   data-aop="mestripe.onenote_meonenote"  data-id="27" data-m='{"i":27,"p":20,"n":"meStripe.onenote","t":"meOneNote","o":7}'>
- <a href="https://www.onenote.com/notebooks?WT.mc_id=MSN_OneNote_TopMenu&amp;auth=1" target="_blank" data-piitxt="onenote" piiurl="https://www.onenote.com/notebooks?WT.mc_id=MSN_OneNote_TopMenu&amp;auth=1">
-<h3>OneNote<span></span></h3>
-</a>
- </li>
- <li  class="onedrive"   data-aop="mestripe.onedrive_me"  data-id="28" data-m='{"i":28,"p":20,"n":"meStripe.onedrive","t":"me","o":8}'>
- <a href="https://onedrive.live.com/?wt.mc_id=oo_msn_msnhomepage_header" target="_blank" data-piitxt="onedrive" piiurl="https://onedrive.live.com/?wt.mc_id=oo_msn_msnhomepage_header">
-<h3>OneDrive<span></span></h3>
-</a>
- </li>
- <li  class="maps"   data-aop="mestripe.maps_memaps"  data-id="29" data-m='{"i":29,"p":20,"n":"meStripe.maps","t":"meMaps","o":9}'>
- <a href="http://bing.com/maps/?FORM=MSNMAP" target="_blank" data-piitxt="maps" piiurl="http://bing.com/maps/?FORM=MSNMAP">
-<h3>Maps<span></span></h3>
-</a>
- </li>
- <li  class="facebook"   data-aop="mestripe.facebook_me"  data-id="30" data-m='{"i":30,"p":20,"n":"meStripe.facebook","t":"me","o":10}'>
- <a href="http://www.facebook.com/" target="_blank" data-piitxt="facebook" piiurl="http://www.facebook.com/">
-<h3>Facebook<span></span></h3>
-</a>
- </li>
- <li  class="twitter"   data-aop="mestripe.twitter_me"  data-id="31" data-m='{"i":31,"p":20,"n":"meStripe.twitter","t":"me","o":11}'>
- <a href="https://twitter.com/" target="_blank" data-piitxt="twitter" piiurl="https://twitter.com/">
-<h3>Twitter<span></span></h3>
-</a>
- </li>
- <li  class="xbox"   data-aop="mestripe.xmusic_mexbox"  data-id="32" data-m='{"i":32,"p":20,"n":"meStripe.xmusic","t":"meXbox","o":12}'>
- <a href="http://aka.ms/m0lr77" target="_blank" data-piitxt="xbox" piiurl="http://aka.ms/m0lr77">
-<h3>Groove<span></span></h3>
-</a>
- </li>
- </ul>
-
-</div>
-<button class="stripearrow"  data-aop="rightarrow"  data-id="33" data-m='{"i":33,"p":20,"n":"rightarrow","y":12,"o":13}'></button>
-</div>
- <div class="meflyouts">
- <div  class="meflyoutcontainer mail"   data-id="34" data-m='{"i":34,"p":20,"n":"meStripe.mail","y":5,"o":14}'>
- 
-<div class="meflyout signin">
-<section>
-
- <div class="mailsignedoutflyout signout"  data-aop="outlooksignedoutflyout"  data-id="35" data-m='{"i":35,"p":34,"n":"outlooksignedoutflyout","y":8,"o":1}'>
- 
-<section>
-<h2>Get your mail here</h2>
-<ul>
- <li>See your recent emails</li>
- <li>Send a quick email</li>
- <li>Manage your calendar with easy access</li>
- </ul>
-</section>
-<h3>Sign in with any Microsoft account: Outlook, Hotmail, MSN, Live</h3>
-<p><a href="http://go.microsoft.com/fwlink/?LinkID=254486"  data-id="36" data-m='{"i":36,"p":35,"n":"mailsignedoutflyout-accounthelp","y":12,"o":1}'>What is a Microsoft account?</a></p>
-<ul>
-<li>
-<a href="http://login.live.com/logout.srf?ct=1447878614&amp;rver=6.1.6195.0&amp;lc=1033&amp;id=1184&amp;lru=https:%2f%2fwww.msn.com%2fen-us%2fhomepage%2fSecure%2fPassport%3fru%3dhttp%253a%252f%252fwww.msn.com%252f&amp;mkt=en-us&amp;pcexp=True"  data-id="37" data-m='{"i":37,"p":35,"n":"mailsignedoutflyout-signin","y":12,"o":2}'>SIGN IN</a>
-</li>
-<li>
-<a href="http://login.live.com/logout.srf?ct=1447878614&amp;rver=6.1.6195.0&amp;lc=1033&amp;id=1184&amp;lru=https:%2f%2fwww.msn.com%2fen-us%2fhomepage%2fSecure%2fPassport%3fru%3dhttp%253a%252f%252fwww.msn.com%252f&amp;mkt=en-us&amp;pcexp=True"  data-id="38" data-m='{"i":38,"p":35,"n":"mailsignedoutflyout-createaccount","y":12,"o":3}'>Create Now</a>
-</li>
-</ul>
- 
-</div>
-
- </section>
- </div>
- 
-</div>
-<div  class="meflyoutcontainer store"   data-id="39" data-m='{"i":39,"p":20,"n":"meStripe.store","y":5,"o":15}'>
- 
-<div class="meflyout signin">
-<section>
- <a href="http://clk.tradedoubler.com/click?p=261853&amp;a=2529304&amp;g=0&amp;epi=Prime_WW_HP_MEstoreH&amp;url=http://www.microsoftstore.com?icid=MSN_storeHL" target="_blank"  data-id="40" data-m='{"i":40,"p":39,"n":"store","y":14,"l":"me_store_headerText_signIn","o":1}'><h3>Microsoft Store</h3></a>
- <div >
-
- <ul  data-module-id="startpage|meStripe|meStripe|meStripe.store|meStore">
- <li>
-<a  href="http://clk.tradedoubler.com/click?p=261853&amp;a=2529304&amp;g=0&amp;epi=Prime_ENUS_HP_ME_L1&amp;url=http://www.microsoftstore.com/store/msusa/en_US/cat/Windows/categoryID.70036700" target="_blank"  data-id="41" data-m='{"i":41,"p":39,"n":"HeadlineItemViewModel","y":13,"o":2}'>
-<img alt="Windows 10" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAfukpt.img?h=50&amp;w=50&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Microsoft" /> <h3>Upgrade free -- it&#39;s easy.</h3>
- <p>Do great things with Windows 10</p>
- </a>
-</li>
- <li>
-<a  href="http://clk.tradedoubler.com/click?p=261853&amp;a=2529304&amp;g=0&amp;epi=Prime_ENUS_HP_ME2&amp;url=http://www.microsoftstore.com/store/msusa/en_US/list/Great-savings-on-consoles-games-and-accessories/categoryID.67557100?icid=XboxUber_ModG_Deals_Holiday15" target="_blank"  data-id="42" data-m='{"i":42,"p":39,"n":"HeadlineItemViewModel","y":13,"o":3}'>
-<img alt="Xbox" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAfpRwA.img?h=50&amp;w=50&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Microsoft" /> <h3>Get a jump on the holidays with Xbox deals</h3>
- <p>Score big while supplies last</p>
- </a>
-</li>
- <li>
-<a  href="http://clk.tradedoubler.com/click?p=261853&amp;a=2529304&amp;g=0&amp;epi=Prime_ENUS_HP_ME3&amp;url=http://www.microsoftstore.com/store/msusa/en_US/pdp/Surface-Pro-4/productID.325711500" target="_blank"  data-id="43" data-m='{"i":43,"p":39,"n":"HeadlineItemViewModel","y":13,"o":4}'>
-<img alt="Surface Pro 4" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAfaeZc.img?h=50&amp;w=50&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Microsoft" /> <h3>You&#39;ll love the new Surface Pro 4</h3>
- <p>Performance and versatility</p>
- </a>
-</li>
- <li>
-<a  href="http://clk.tradedoubler.com/click?p=261853&amp;a=2529304&amp;g=0&amp;epi=Prime_ENUS_HP_Me4&amp;url=http://www.microsoftstore.com/store/msusa/en_US/cat/Holiday-Gift-Guide/categoryID.67001000?icid=en_US_FY16_Holiday_Homepage_WhatsNew_3_GG_111615" target="_blank"  data-id="44" data-m='{"i":44,"p":39,"n":"HeadlineItemViewModel","y":13,"o":5}'>
-<img alt="Gift" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn5eCi.img?h=50&amp;w=50&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=514&amp;y=393&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Tooga/Getty Images" /> <h3>Find the perfect gift for everyone on your list</h3>
- <p>Shop early and save</p>
- </a>
-</li>
- </ul>
- </div>
- </section>
- <ul>
- <li  data-id="45" data-m='{"i":45,"p":39,"n":"store","y":14,"l":"me_store_taskLinks_surface","o":6}'>
-<a href="http://clk.tradedoubler.com/click?p=261853&amp;a=2529304&amp;g=0&amp;epi=Prime_ENUS_HP_MESurf&amp;url=http://www.microsoftstore.com/store/msusa/en_US/cat/All-Surface/categoryID.69403400?icid=MSN_surface" target="_blank">Surface<span></span></a>
-</li>
- <li  data-id="46" data-m='{"i":46,"p":39,"n":"store","y":14,"l":"me_store_taskLinks_windows","o":7}'>
-<a href="http://clk.tradedoubler.com/click?p=261853&amp;a=2529304&amp;g=0&amp;epi=Prime_ENUS_HP_MEWin10&amp;url=http://www.microsoftstore.com/store/msusa/en_US/cat/Windows/categoryID.70036700?icid=MSN_Win10" target="_blank">Windows<span></span></a>
-</li>
- <li  data-id="47" data-m='{"i":47,"p":39,"n":"store","y":14,"l":"me_store_taskLinks_support","o":8}'>
-<a href="http://clk.tradedoubler.com/click?p=261853&amp;a=2529304&amp;g=0&amp;epi=Prime_WW_HP_MEstoreSupport&amp;url=http://www.microsoftstore.com/help" target="_blank">Support<span></span></a>
-</li>
- </ul>
- </div>
- 
-</div>
-<div  class="meflyoutcontainer integratedskype"   data-id="48" data-m='{"i":48,"p":20,"n":"meStripe.integratedSkype","y":5,"o":16}'>
- 
-<div class="meflyout signin">
-<section>
-
- <div class="integratedskypeflyout signout">
-<section>
-<h2>Skype on MSN</h2>
-<ul>
- <li>See who&#39;s online</li>
- <li>Notifications and missed messages</li>
- <li>Voice calls and chats</li>
- </ul>
-</section>
-<h3>Start connecting your Skype</h3>
-<p class="icon microsoft">Connecting Skype with MSN requires a Microsoft account to get set up.</p>
-<ul>
-<li>
-<p>Already have a Microsoft account?</p>
-<a href="http://login.live.com/logout.srf?ct=1447878614&amp;rver=6.1.6195.0&amp;lc=1033&amp;id=1184&amp;lru=https:%2f%2fwww.msn.com%2fen-us%2fhomepage%2fSecure%2fPassport%3fru%3dhttp%253a%252f%252fwww.msn.com%252f&amp;mkt=en-us&amp;pcexp=True"  data-id="49" data-m='{"i":49,"p":48,"n":"integratedskype-signin","y":12,"o":1}'>Sign In</a>
-</li>
-<li>
-<p>Don&#39;t have a Microsoft account?</p>
-<a href="http://login.live.com/logout.srf?ct=1447878614&amp;rver=6.1.6195.0&amp;lc=1033&amp;id=1184&amp;lru=https:%2f%2fwww.msn.com%2fen-us%2fhomepage%2fSecure%2fPassport%3fru%3dhttp%253a%252f%252fwww.msn.com%252f&amp;mkt=en-us&amp;pcexp=True"  data-id="50" data-m='{"i":50,"p":48,"n":"integratedskype-createaccount","y":12,"o":2}'>Create Now</a>
-</li>
-</ul>
-</div>
- </section>
- </div>
- 
-</div>
-<div  class="meflyoutcontainer bingrewards"   data-id="51" data-m='{"i":51,"p":20,"n":"meStripe.mebingrewards","y":5,"o":17}'>
- 
-<div class="meflyout signin">
-<section>
- <div  data-signedout-image-url="//static-hp-wus.s-msn.com/sc/homepage/i/75/e87bfa2234b8fb56d3591587f24f87.jpg">
-
- </div>
- </section>
- <ul>
- <li  data-id="52" data-m='{"i":52,"p":51,"n":"bingrewards","y":14,"l":"me_bingrewards_taskLinks_redeem","o":1}'>
-<a href="http://www.bing.com/rewards/redeem/all" target="_blank">Redeem your credits<span></span></a>
-</li>
- <li  data-id="53" data-m='{"i":53,"p":51,"n":"bingrewards","y":14,"l":"me_bingrewards_taskLinks_gethelp","o":2}'>
-<a href="https://www.bing.com/rewards/faq" target="_blank">Get help<span></span></a>
-</li>
- </ul>
- </div>
- 
-</div>
-<div  class="meflyoutcontainer office"   data-id="54" data-m='{"i":54,"p":20,"n":"meStripe.office","y":5,"o":18}'>
- 
-<div class="meflyout signin">
-<section>
- <a href="https://onedrive.live.com/#qt=mru" target="_blank"  data-id="55" data-m='{"i":55,"p":54,"n":"office","y":14,"l":"me_office_headerText_signIn","o":1}'><h3>Recent documents</h3></a>
- <div  data-signedout-image-url="//static-hp-wus.s-msn.com/sc/homepage/i/65/e8a77758e8644573ba5d41ada16e8c.jpg">
-
-<div  data-module-id="startpage|meStripe|meStripe|meStripe.office|meOffice"  data-cache-duration="300000"  data-module-deferred="true">
-</div> </div>
- </section>
- <ul>
- <li  data-id="56" data-m='{"i":56,"p":54,"n":"office","y":14,"l":"me_office_tasklinktext_word","o":2}'>
-<a href="https://office.live.com/start/Word.aspx?WT.mc_id=MSN_site" target="_blank">Word Online<span></span></a>
-</li>
- <li  data-id="57" data-m='{"i":57,"p":54,"n":"office","y":14,"l":"me_office_tasklinktext_excel","o":3}'>
-<a href="https://office.live.com/start/Excel.aspx?WT.mc_id=MSN_site" target="_blank">Excel Online<span></span></a>
-</li>
- <li  data-id="58" data-m='{"i":58,"p":54,"n":"office","y":14,"l":"me_office_tasklinktext_sway","o":4}'>
-<a href="https://www.sway.com/?WT.mc_id=MSN_site&amp;utm_source=MSN&amp;utm_medium=Topnav&amp;utm_campaign=link" target="_blank">Sway<span></span></a>
-</li>
- <li  data-id="59" data-m='{"i":59,"p":54,"n":"office","y":14,"l":"me_office_tasklinktext_powerpoint","o":5}'>
-<a href="https://office.live.com/start/PowerPoint.aspx?WT.mc_id=MSN_site" target="_blank">PowerPoint Online<span></span></a>
-</li>
- </ul>
- </div>
- 
-</div>
-<div  class="meflyoutcontainer onenote"   data-id="60" data-m='{"i":60,"p":20,"n":"meStripe.onenote","y":5,"o":19}'>
- 
-<div class="meflyout signin">
-<section>
- <a href="https://www.onenote.com/notebooks?WT.mc_id=MSN_OneNote_Recent&amp;auth=1" target="_blank"  data-id="61" data-m='{"i":61,"p":60,"n":"onenote","y":14,"l":"me_onenote_headerText_signIn","o":1}'><h3>Recent Notebooks</h3></a>
- <div  data-signedout-image-url="//static-hp-wus.s-msn.com/sc/homepage/i/71/015396167bb5e7dd935c6776d4b2ba.jpg">
-
-<div  data-module-id="startpage|meStripe|meStripe|meStripe.onenote|meOneNote"  data-cache-duration="300000"  data-module-deferred="true">
-</div> </div>
- </section>
- <ul>
- <li  data-id="62" data-m='{"i":62,"p":60,"n":"onenote","y":14,"l":"me_onenote_tasklinktext_quicknote","o":2}'>
-<a href="https://www.onenote.com/notebooks?WT.mc_id=MSN_OneNote_QuickNote&amp;auth=1" target="_blank">Quick Note<span></span></a>
-</li>
- </ul>
- </div>
- 
-</div>
-<div  class="meflyoutcontainer onedrive"   data-id="63" data-m='{"i":63,"p":20,"n":"meStripe.onedrive","y":5,"o":20}'>
- 
-<div class="meflyout signin">
-<section>
- <a href="https://onedrive.live.com/?wt.mc_id=oo_msn_msnhomepage_header" target="_blank"  data-id="64" data-m='{"i":64,"p":63,"n":"onedrive","y":14,"l":"me_onedrive_headerText_signIn","o":1}'><h3>OneDrive</h3></a>
- <div  data-signedout-image-url="//static-hp-wus.s-msn.com/sc/homepage/i/51/fdd733fc193cd8c9207c5338107240.jpg">
- </div>
- </section>
- <ul>
- <li  data-id="65" data-m='{"i":65,"p":63,"n":"onedrive","y":14,"l":"me_onedrive_tasklinktext_files","o":2}'>
-<a href="https://onedrive.live.com/" target="_blank">Files<span></span></a>
-</li>
- <li  data-id="66" data-m='{"i":66,"p":63,"n":"onedrive","y":14,"l":"me_onedrive_tasklinktext_photos","o":3}'>
-<a href="https://onedrive.live.com/?qt=allmyphotos" target="_blank">Photos<span></span></a>
-</li>
- <li  data-id="67" data-m='{"i":67,"p":63,"n":"onedrive","y":14,"l":"me_onedrive_tasklinktext_documents","o":4}'>
-<a href="https://onedrive.live.com/?qt=mru" target="_blank">Recent documents<span></span></a>
-</li>
- <li  data-id="68" data-m='{"i":68,"p":63,"n":"onedrive","y":14,"l":"me_onedrive_tasklinktext_downloadapp","o":5}'>
-<a href="https://onedrive.live.com/about?page=download" target="_blank">Download the OneDrive app<span></span></a>
-</li>
- </ul>
- </div>
- 
-</div>
-<div  class="meflyoutcontainer maps"   data-id="69" data-m='{"i":69,"p":20,"n":"meStripe.maps","y":5,"o":21}'>
- 
-<div class="meflyout signin">
-<section>
- <a href="http://www.bing.com/maps/?FORM=MSNLOC&amp;cp=47.62~-122.18&amp;lvl=12" target="_blank"  data-id="70" data-m='{"i":70,"p":69,"n":"maps","y":14,"l":"me_maps_headerText","o":1}'><h3>Redmond</h3></a>
- <div >
-
- <a href="http://www.bing.com/maps/?FORM=MSNSMP&amp;cp=47.62~-122.18&amp;lvl=12&amp;trfc=1" target="_blank"  data-id="71" data-m='{"i":71,"p":69,"n":"static.map","y":14,"o":2}'>
- <img alt="The Bing Maps image with traffic information" data-src="{&quot;default&quot;:&quot;//ecn.dev.virtualearth.net/REST/v1/Imagery/Map/road/47.62,-122.18/12?mapSize=368,182&amp;mapLayer=trafficflow&amp;c=en&amp;key=Ar57SaDngRFDOGK62G-DuNqDGb44RUPiWza5E9lLntmzp2nFhJnvFELTRZFUhoyq&amp;maxAge=300&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-</a>
- </div>
- </section>
- <ul>
- <li  data-id="72" data-m='{"i":72,"p":69,"n":"maps","y":14,"l":"me_maps_directions","o":3}'>
-<a href="http://www.bing.com/maps/?FORM=MSNDIR&amp;rtp=pos.47.62_-122.18&amp;mode=D" target="_blank">Directions<span></span></a>
-</li>
- <li  data-id="73" data-m='{"i":73,"p":69,"n":"maps","y":14,"l":"me_maps_traffic","o":4}'>
-<a href="http://www.bing.com/maps/?FORM=MSNTRF&amp;cp=47.62~-122.18&amp;lvl=12&amp;trfc=1" target="_blank">Traffic<span></span></a>
-</li>
- </ul>
- </div>
- 
-</div>
-<div  class="meflyoutcontainer facebook"   data-id="74" data-m='{"i":74,"p":20,"n":"meStripe.facebook","y":5,"o":22}'>
- 
-<div class="meflyout signout">
-<section>
- <div  data-signedout-image-url="//static-hp-wus.s-msn.com/sc/homepage/i/b9/688ba69ea7a207af53ba3184ed8c56.jpg">
-<img alt="" data-src="{&quot;default&quot;:&quot;//static-hp-wus.s-msn.com/sc/HomePage/i/b9/688ba69ea7a207af53ba3184ed8c56.jpg&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <p>Get your latest feed from Facebook</p>
- </div>
- <a class="mefoot" href="#"   data-id="75" data-m='{"i":75,"p":74,"n":"facebook","y":14,"l":"me_facebook_footerText","o":1}'>Sign in</a>
- </section>
- </div>
- 
-</div>
-<div  class="meflyoutcontainer twitter"  data-deferred="1"  data-id="76" data-m='{"i":76,"p":20,"n":"meStripe.twitter","y":5,"o":23}'>
- 
-<div class="meflyout signout">
-<section>
- <div  data-signedout-image-url="//static-hp-wus.s-msn.com/sc/homepage/i/7d/30f1c30a21f2240e5abc7b24a3a057.jpg">
-<img alt="" data-src="{&quot;default&quot;:&quot;//static-hp-wus.s-msn.com/sc/HomePage/i/7d/30f1c30a21f2240e5abc7b24a3a057.jpg&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <p>Get your Twitter Updates</p>
- </div>
- <a class="mefoot" href="https://twitter.com/"   data-id="77" data-m='{"i":77,"p":76,"n":"twitter","y":14,"l":"me_twitter_footerText","o":1}'>Sign In</a>
- </section>
- </div>
- 
-</div>
-<div  class="meflyoutcontainer xbox"   data-id="78" data-m='{"i":78,"p":20,"n":"meStripe.xmusic","y":5,"o":24}'>
- 
-<div class="meflyout signin">
-<section>
- <a href="http://aka.ms/qeqf5y" target="_blank"  data-id="79" data-m='{"i":79,"p":78,"n":"xbox","y":14,"l":"me_xbox_headerText","o":1}'><h3>Spotlight</h3></a>
- <div >
-
-
- <ul  data-module-id="startpage|meStripe|meStripe|meStripe.xmusic|meXbox">
- <li>
-<a href="http://music.microsoft.com/album/justin-bieber/justin-bieber/62125b09-0100-11db-89ca-0019b92a3933?partnerID=MSN_XboxMusic_Dev&amp;action=play" target="_blank"  data-id="80" data-m='{"i":80,"p":78,"n":"xbox_musicselection","y":14,"o":2}'>
- <img alt="album cover" data-src="{&quot;default&quot;:&quot;//musicimage.xboxlive.com/catalog/music.62125b09-0100-11db-89ca-0019b92a3933/image?locale=en-US&amp;w=50&amp;h=50&amp;mode=scale&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-<h3>Justin Bieber</h3>
-<p>Justin Bieber</p>
-</a>
-</li>
- <li>
-<a href="http://music.microsoft.com/album/one-direction/one-direction/ec0e5b09-0100-11db-89ca-0019b92a3933?partnerID=MSN_XboxMusic_Dev&amp;action=play" target="_blank"  data-id="81" data-m='{"i":81,"p":78,"n":"xbox_musicselection","y":14,"o":3}'>
- <img alt="album cover" data-src="{&quot;default&quot;:&quot;//musicimage.xboxlive.com/catalog/music.ec0e5b09-0100-11db-89ca-0019b92a3933/image?locale=en-US&amp;w=50&amp;h=50&amp;mode=scale&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-<h3>One Direction</h3>
-<p>One Direction</p>
-</a>
-</li>
- <li>
-<a href="http://music.microsoft.com/album/young-jeezy/jeezy/cba95409-0100-11db-89ca-0019b92a3933?partnerID=MSN_XboxMusic_Dev&amp;action=play" target="_blank"  data-id="82" data-m='{"i":82,"p":78,"n":"xbox_musicselection","y":14,"o":4}'>
- <img alt="album cover" data-src="{&quot;default&quot;:&quot;//musicimage.xboxlive.com/catalog/music.cba95409-0100-11db-89ca-0019b92a3933/image?locale=en-US&amp;w=50&amp;h=50&amp;mode=scale&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-<h3>Jeezy</h3>
-<p>Young Jeezy</p>
-</a>
-</li>
- </ul>
-
- </div>
- </section>
- <ul>
- <li  data-id="83" data-m='{"i":83,"p":78,"n":"xbox","y":14,"l":"me_groove_taskLinks_store","o":5}'>
-<a href="https://www.microsoft.com/store/media/redirect/music?view=hub" target="_blank">Music Store<span></span></a>
-</li>
- <li  data-id="84" data-m='{"i":84,"p":78,"n":"xbox","y":14,"l":"me_groove_taskLinks_play","o":6}'>
-<a href="http://aka.ms/Ixhi8e" target="_blank">Play your music on OneDrive<span></span></a>
-</li>
- <li  data-id="85" data-m='{"i":85,"p":78,"n":"xbox","y":14,"l":"me_groove_taskLinks_try","o":7}'>
-<a href="http://aka.ms/msvmj1" target="_blank">Try Groove Music Pass free<span></span></a>
-</li>
- </ul>
- </div>
- 
-</div>
-
-</div>
- 
-</div>
-<div class='normalsection'  data-section-id="toptakeoverad"><div class='full-width'><div class='sectioncontent'  data-region="toptakeoverad_section">
- <div  id="banner1_homepage_2eae1806-3559-44c5-85ee-fe547975b605"  class="widead"   data-aop="toptakeoverad.ad_ad"  data-id="86" data-m='{"i":86,"p":19,"n":"topTakeoverAd.ad","t":"ad","o":2}' >
-<div class="outeradcontainer">
-<div  id="banner1_homepage_container_2eae1806-3559-44c5-85ee-fe547975b605" class="adcontainer" data-adjs='{"allowedViews":"SIZE234COLUMN"}'>
- <script class="sdkdapscript">
-                        require(["dap"], function (dap)
-                        {
- dap("&amp;AP=1402&amp;PG=MSNUSEN15&amp;PVGUID=cc7227b7f7fe4e3bb644226f3ef2c489&amp;PROVIDERID=7HD66FC", 1, 1, "banner1_homepage_container_2eae1806-3559-44c5-85ee-fe547975b605", {"isEnabled":0, "isDarkTheme":0}, {"scrollInit":true,"enableAdRefresh":true,"adaptiveRefresh":true,"adaptiveRefreshInterval":3000,"prid":"7HD66FC","rid":"cc7227b7f7fe4e3bb644226f3ef2c489"});
- });
-</script>
- </div>
-     <a href="http://go.microsoft.com/fwlink/?LinkID=286759" class="adchoices" target="_blank" data-piitxt="adchoices">
-        <span class="adchoiceicon"></span>
-        <span>AdChoices</span>
-    </a>
-
-</div>
-</div>
-</div></div></div> <div class="normalsection todaynavigation"  data-section-id="todaynavigation"  data-aop="todaynavigation_section"  data-id="87" data-m='{"i":87,"p":19,"n":"todayNavigation","y":4,"o":3}'>
- 
-<div class="full-width">
-<button class="stripearrow"  data-aop="leftarrow"  data-id="88" data-m='{"i":88,"p":87,"n":"leftarrow","y":12,"o":1}'></button>
-<div class="sectioncontent">
- <div class="stripenav"  data-aop="stripe.today.navigation_todaystripenavigation"  data-id="89" data-m='{"i":89,"p":87,"n":"stripe.today.navigation","t":"todayStripeNavigation","o":2}'>
- 
-<ul>
- <li class="makehomepage"  data-id="90" data-m='{"i":90,"p":89,"n":"make_homepage_text","y":4,"o":1}'><h2><a href="http://www.myhomemsn.com/?form=MDBMDF&publ=MSNHPG&crea=TEXT_MDBMDF_DHP_DHP_static_1x1" target="_blank"  data-id="91" data-m='{"i":91,"p":89,"n":"make_homepage_text","y":4,"o":2}'>Make MSN my homepage</a></h2></li>
-  <li  class="news"  data-id="92" data-m='{"i":92,"p":89,"n":"news","y":4,"o":3}'><a href="/en-us/news">NEWS</a></li>
- <li  class="weatoday weather"  data-id="93" data-m='{"i":93,"p":89,"n":"weather","y":4,"o":4}'><a href="/en-us/weather">WEATHER</a></li>
- <li  class="entertainment"  data-id="94" data-m='{"i":94,"p":89,"n":"entertainment","y":4,"o":5}'><a href="/en-us/entertainment">ENTERTAINMENT</a></li>
- <li  class="sports"  data-id="95" data-m='{"i":95,"p":89,"n":"sports","y":4,"o":6}'><a href="/en-us/sports">SPORTS</a></li>
- <li  class="finance"  data-id="96" data-m='{"i":96,"p":89,"n":"finance","y":4,"o":7}'><a href="/en-us/money">MONEY</a></li>
- <li  class="lifestyle"  data-id="97" data-m='{"i":97,"p":89,"n":"lifestyle","y":4,"o":8}'><a href="/en-us/lifestyle">LIFESTYLE</a></li>
- <li  class="healthfitness"  data-id="98" data-m='{"i":98,"p":89,"n":"health","y":4,"o":9}'><a href="/en-us/health">HEALTH &amp; FITNESS</a></li>
- <li  class="fooddrink"  data-id="99" data-m='{"i":99,"p":89,"n":"foodanddrink","y":4,"o":10}'><a href="/en-us/foodanddrink">FOOD &amp; DRINK</a></li>
- <li  class="travel"  data-id="100" data-m='{"i":100,"p":89,"n":"travel","y":4,"o":11}'><a href="/en-us/travel">TRAVEL</a></li>
- <li  class="autos"  data-id="101" data-m='{"i":101,"p":89,"n":"autos","y":4,"o":12}'><a href="/en-us/autos">AUTOS</a></li>
- <li  class="video"  data-id="102" data-m='{"i":102,"p":89,"n":"video","y":4,"o":13}'><a href="/en-us/video">VIDEO</a></li>
- <li  class="dating"  data-id="103" data-m='{"i":103,"p":89,"n":"Dating","y":4,"o":14}'><a href="http://www.match.com/cpx/en-us/partner/msn/index?trackingid=530294&amp;bannerid=3414605">DATING</a></li>
-  </ul>
- 
-</div>
-
- </div>
-<button class="stripearrow"  data-aop="rightarrow"  data-id="104" data-m='{"i":104,"p":87,"n":"rightarrow","y":12,"o":3}'></button>
-</div>
- 
-</div>
-<div class='normalsection'  data-section-id="outlooklogout"><div class='full-width'><div class='sectioncontent'  data-region="outlooklogout_section">
-</div></div></div>
- <div  class="todaystripe grid layout-medium edpicks mod1"  data-section-id="today"  data-module-id="startpage|today|todaystripe|today.Hero|todayStripeHeadlines" data-uipr="2"  data-aop="today.hero_todaystripeheadlines"  data-id="105" data-m='{"i":105,"p":19,"n":"today.Hero","t":"todayStripeHeadlines","o":4}'>
- 
-<ul>
-<li class="infopane-placeholder">
- 
- <div class="ip infopanestripe slideshow "
- data-nativead="40_infopane_li:nth-child(10);40_infopane_li:nth-child(6)" data-section-id="infopane"
-  data-module-id="startpage|infopane|infopanestripe|infopane_a|infopaneStripeHeadlines" data-uipr="1"  data-aop="infopane_a_infopanestripeheadlines"  data-id="106" data-m='{"i":106,"p":105,"n":"infopane_a","t":"infopaneStripeHeadlines","o":1}'
->
- 
-<ul class="swipenav">
-    <li class=" halfpane   hasimage  selected "  data-aop="slide1>halfpane "  data-id="107" data-m='{"i":107,"p":106,"n":"halfpane","y":13,"o":1}' >
-        
-            <a   href="/en-us/news/world/suspected-architect-of-paris-attacks-is-dead-according-to-two-senior-intelligence-officials/ar-BBn9MAB?li=AAa0dzB"
-        data-id="108" data-m='{"i":108,"p":107,"n":"HeadlineItemViewModel","y":13,"l":"BBn9MAB","h":0,"v":"news","c":"newsworld","o":1}'  >
-        
-<img alt="Police forces and soldiers patrol in Saint-Denis, a northern suburb of Paris, We..." onerror="this.className=&#39;err&#39;" onload="this.className=&#39;loaded&#39;" src="http://img-s-msn-com.akamaized.net/tenant/amp/entityid/BBna4iX.img?h=368&amp;w=522&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=735&amp;y=623" title="AP Photo/Christophe Ena" />
-            <div class="caption">
-        <span class="title" >Sources: Alleged ringleader of Paris attacks is dead</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB6Dp75.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            The Washington Post
-        </span>
-    </div>
-
-        
-    </a>
-
-        <ul>
-                <li class="reltitle">Paris aftermath</li>
-
-                <li>
-                        <a   href="/en-us/news/world/exclusive-suspects-had-planned-attack-on-paris-business-district-sources/ar-BBn9KtK?li=AAa0dzB"
-        data-id="109" data-m='{"i":109,"p":107,"n":"HeadlineItemViewModel","y":13,"l":"BBn9KtK","h":0,"v":"news","c":"newsworld","o":2}'  >
-        
-
-            <div class="caption">
-        <span class="title" >Sources: Raid suspects were planning another attack</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3lqJx.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Reuters
-        </span>
-    </div>
-
-        
-    </a>
-
-                </li>
-                <li>
-                        <a   href="/en-us/news/world/the-latest-paris-attacks-spark-suspicions-about-refugees/ar-BBn8LwF?li=AAa0dzB"
-        data-id="110" data-m='{"i":110,"p":107,"n":"HeadlineItemViewModel","y":13,"l":"BBn8LwF","h":0,"v":"news","c":"newsworld","o":3}'  >
-        
-
-            <div class="caption">
-        <span class="title" >Paris attacks spark suspicions about refugees</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA42Hq5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Associated Press
-        </span>
-    </div>
-
-        
-    </a>
-
-                </li>
-                <li>
-                        <a   href="/en-us/news/world/stories-of-those-who-died-in-the-paris-attacks/ar-BBnaCci?li=AAa0dzB"
-        data-id="111" data-m='{"i":111,"p":107,"n":"HeadlineItemViewModel","y":13,"l":"BBnaCci","h":0,"v":"news","c":"newsworld","o":4}'  >
-        
-
-            <div class="caption">
-        <span class="title" >Stories of those who died in the Paris attacks</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA42Hq5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Associated Press
-        </span>
-    </div>
-
-        
-    </a>
-
-                </li>
-        </ul>
-        
-    </li>
-    <li class=" halfpane   hasimage "  data-aop="slide2>halfpane "  data-id="112" data-m='{"i":112,"p":106,"n":"halfpane","y":13,"o":2}' >
-        
-            <a   href="/en-us/news/world/islamic-state-says-schweppes-bomb-used-to-bring-down-russian-plane/ar-BBn9a24?li=AAa0dzB"
-        data-id="113" data-m='{"i":113,"p":112,"n":"HeadlineItemViewModel","y":13,"l":"BBn9a24","h":0,"v":"news","c":"newsworld","o":1}'  >
-        
-<img alt="In this Sunday, Nov. 1, 2015 file photo provided by Russian Emergency Situations..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9JmW.img?h=368&amp;w=522&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1251&amp;y=419&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Maxim Grigoriev/Russian Ministry for Emergency Situations via AP, File" />
-            <div class="caption">
-        <span class="title" >IS says &#39;Schweppes bomb&#39; used to down Russian plane</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3e1oO.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Reuters
-        </span>
-    </div>
-
-        
-    </a>
-
-        <ul>
-                <li class="reltitle">ISIS</li>
-
-                <li>
-                        <a   href="/en-us/news/world/is-group-says-it-has-killed-norwegian-chinese-captives/ar-BBn9Rxh?li=AAa0dzB"
-        data-id="114" data-m='{"i":114,"p":112,"n":"HeadlineItemViewModel","y":13,"l":"BBn9Rxh","h":0,"v":"news","c":"newsworld","o":2}'  >
-        
-
-            <div class="caption">
-        <span class="title" >IS group says it has killed Norwegian, Chinese captives</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA42Hq5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Associated Press
-        </span>
-    </div>
-
-        
-    </a>
-
-                </li>
-                <li>
-                        <a   href="/en-us/news/world/turkey-detains-8-europe-bound-is-suspects-posing-as-refugees/ar-BBn9KSX?li=AAa0dzB"
-        data-id="115" data-m='{"i":115,"p":112,"n":"HeadlineItemViewModel","y":13,"l":"BBn9KSX","h":0,"v":"news","c":"newsworld","o":3}'  >
-        
-
-            <div class="caption">
-        <span class="title" >Turkey detains 8 IS suspects &#39;posing as refugees&#39;</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB74fLs.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            AFP
-        </span>
-    </div>
-
-        
-    </a>
-
-                </li>
-                <li>
-                        <a   href="/en-us/news/world/in-rise-of-isis-no-single-missed-key-but-many-strands-of-blame/ar-BBn9jkF?li=AAa0dzB"
-        data-id="116" data-m='{"i":116,"p":112,"n":"HeadlineItemViewModel","y":13,"l":"BBn9jkF","h":0,"v":"news","c":"newsworld","o":4}'  >
-        
-
-            <div class="caption">
-        <span class="title" >In Rise of ISIS, Many Strands of Blame</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3l3r5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            The New York Times
-        </span>
-    </div>
-
-        
-    </a>
-
-                </li>
-        </ul>
-        
-    </li>
-    <li class=" triptych   hasimage "  data-aop="slide3>triptych "  data-id="117" data-m='{"i":117,"p":106,"n":"tryptic","y":13,"o":3}' >
-        
-
-            <h4>Top news</h4>
-
-            <a   href="/en-us/news/us/officers-identified-in-fatal-minneapolis-shooting/ar-BBnanLU?li=AAa0dzB"
-        data-id="118" data-m='{"i":118,"p":117,"n":"HeadlineItemViewModel","y":13,"l":"BBnanLU","h":0,"v":"news","c":"newsus","o":1}'  >
-        
-<img alt="Pat Anderson attends a protest that aimed to demanded answers over the shooting ..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnalD7.img?h=250&amp;w=206&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=663&amp;y=328&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Richard Tsong-Taatarii/Star Tribune via AP" />
-            <div class="caption">
-        <span class="title" >Officers ID&#39;d in Clark shooting</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA42Hq5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Associated Press
-        </span>
-    </div>
-
-        
-    </a>
-
-
-    <a   href="/en-us/news/politics/trump-regains-nh-lead-while-carson-falls-and-rubio-slowly-rises/ar-BBn9zj8?li=AAa0dzB"
-        data-id="119" data-m='{"i":119,"p":117,"n":"HeadlineItemViewModel","y":13,"l":"BBn9zj8","h":0,"v":"news","c":"newspolitics","o":2}'  >
-        
-<img alt="Businessman Donald Trump speaks at the Freedom Summit in Des Moines, Iowa, Janua..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAarmPv.img?h=250&amp;w=206&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=905&amp;y=412&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Jim Young/Reuters" />
-            <div class="caption">
-        <span class="title" >Poll: Trump regains N.H. lead</span>
-        <span class="sourcename">
-            
-            Talking Points Memo
-        </span>
-    </div>
-
-        
-    </a>
-    <a   href="/en-us/weather/topstories/sky-spectacle-the-leonid-meteor-shower-is-coming/ar-BBn8Xia?li=AAa0dzB"
-        data-id="120" data-m='{"i":120,"p":117,"n":"HeadlineItemViewModel","y":13,"l":"BBn8Xia","h":0,"v":"weather","c":"weathertopstories","o":3}'  >
-        
-<img alt="Leonid meteors, streaking past stars, light the night sky in the northern Spanis..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9dok.img?h=250&amp;w=206&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1588&amp;y=1980&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="REUTERS/Victor Fraile" />
-            <div class="caption">
-        <span class="title" >Meteor shower to dazzle tonight</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBktyXb.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            USA Today
-        </span>
-    </div>
-
-        
-    </a>
-        
-    </li>
-    <li class=" head-to-head   hasimage  media photo"  data-aop="slide4>head-to-head "  data-id="121" data-m='{"i":121,"p":106,"n":"headtohead","y":13,"o":4}' >
-        
-
-            <h4>Fashion</h4>
-
-            <a   href="/en-us/music/celebrity/110-of-jlos-most-perfect-fashion-moments/ss-BBn4QOM"
-        data-id="122" data-m='{"i":122,"p":121,"n":"HeadlineItemViewModel","y":13,"l":"BBn4QOM","h":0,"v":"music","c":"music-celebrity","o":1}'  >
-        
-<img alt="Jennifer Lopez performs at the Meydan Racecourse in Dubai, UAE on March 29, 2014..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBm7Lxx.img?h=333&amp;w=311&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=325&amp;y=79&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Getty Images" />
-            <div class="caption">
-        <span class="title" >110 of J.Lo&#39;s most sensational styles</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA9tqjr.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Cosmopolitan
-        </span>
-    </div>
-
-        
-    </a>
-
-
-    <a   href="/en-us/lifestyle/celeb-style/28-times-kate-middleton-and-princess-diana-were-practically-twins/ss-CCfsP8"
-        data-id="123" data-m='{"i":123,"p":121,"n":"HeadlineItemViewModel","y":13,"l":"CCfsP8","h":0,"v":"lifestyle","c":"lifestylecelebstyle","o":2}'  >
-        
-<img alt="Diana in 1988; Kate leaving for Clarence House for the reception following her w..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CCfzeU.img?h=333&amp;w=311&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=213&amp;y=162&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Cosmopolitan" />
-            <div class="caption">
-        <span class="title" >28 times Duchess Kate &amp; Diana were practically twins</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA9tqjr.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Cosmopolitan
-        </span>
-    </div>
-
-        
-    </a>
-        
-    </li>
-    <li class=" single   hasimage  media photo"  data-aop="slide5>single "  data-id="124" data-m='{"i":124,"p":106,"n":"single","y":13,"o":5}' >
-            <a 
-         class="media photo"
-        href="/en-us/travel/holiday-travel/bundle-up-for-these-holiday-attractions-in-all-50-states/ss-CCclkG"
-         data-id="125" data-m='{"i":125,"p":124,"n":"HeadlineItemViewModel","y":13,"l":"CCclkG","h":0,"v":"travel","c":"travel-holiday-travel-en-us","o":1}'  >
-        
-        
-
-<img alt="As the holidays approach, merrymakers willing to brave the brisk weather can fin..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CCclbz.img?h=368&amp;w=622&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1277&amp;y=732&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Sergei Bachlakov/shutterstock" />
-    <div class="caption">
-        <span class="title" >Holiday events taking place in every state</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB90I6E.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Cheapism
-        </span>
-    </div>
-        
-    </a>
-
-        
-    </li>
-    <li class=" single   hasimage  media photo"  data-aop="slide6>single "  data-id="126" data-m='{"i":126,"p":106,"n":"single","y":13,"o":6}' >
-            <a 
-         class="media photo"
-        href="/en-us/tv/gallery/2015-holiday-programming-calendar/ss-BBmYqBl"
-         data-id="127" data-m='{"i":127,"p":126,"n":"HeadlineItemViewModel","y":13,"l":"BBmYqBl","h":0,"v":"tv","c":"tv-gallery","o":1}'  >
-        
-        
-
-<img alt="A CHARLIE BROWN CHRISTMAS ? When Charlie Brown complains about the overwhelming ..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmYDU2.img?h=368&amp;w=622&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="1965 United Feature   Syndicate Inc." />
-    <div class="caption">
-        <span class="title" >Your guide to TV specials this holiday</span>
-        <span class="sourcename">
-            
-            
-        </span>
-    </div>
-        
-    </a>
-
-        
-    </li>
-    <li class=" single   hasimage  media photo"  data-aop="slide7>single "  data-id="128" data-m='{"i":128,"p":106,"n":"single","y":13,"o":7}' >
-            <a 
-         class="media photo"
-        href="/en-us/news/2015yearinreview/comedy-wildlife-photography-awards/ss-BBna9YI"
-         data-id="129" data-m='{"i":129,"p":128,"n":"HeadlineItemViewModel","y":13,"l":"BBna9YI","h":0,"v":"news","c":"2015yearinreview","o":1}'  >
-        
-        
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAfzbQV.img?h=368&amp;w=622&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=884&amp;y=317&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Alison Buttigieg/ Comedy Wildlife Photography Awards" />
-    <div class="caption">
-        <span class="title" >The year&#39;s funniest animal photos</span>
-        <span class="sourcename">
-            
-            
-        </span>
-    </div>
-        
-    </a>
-
-        
-    </li>
-    <li class=" mosaic   hasimage "  data-aop="slide8>mosaic "  data-id="130" data-m='{"i":130,"p":106,"n":"mosaic","y":13,"o":8}' >
-        
-
-            <h4>ENTERTAINMENT</h4>
-
-            <a   href="/en-us/tv/news/nene-leakes-calls-out-the-view-hosts-theyre-a-bunch-of-mean-girls/ar-BBnavMQ?li=AAa0dzB"
-        data-id="131" data-m='{"i":131,"p":130,"n":"HeadlineItemViewModel","y":13,"l":"BBnavMQ","h":0,"v":"tv","c":"tvnews","o":1}'  >
-        
-<img alt="NeNe Leakes attends the premiere screening of FX&#39;s &#39;American Horror Story: Hotel..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnaASC.img?h=333&amp;w=311&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1353&amp;y=654&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Kevin Winter/Getty Images" />
-            <div class="caption">
-        <span class="title" >NeNe Leakes calls out &#39;The View&#39; hosts</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBm8qVB.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            ETOnline
-        </span>
-    </div>
-
-        
-    </a>
-
-
-        <ul>
-                <li>
-                        <a   href="/en-us/tv/celebrity/kim-kardashian-wests-due-date-likely-moved-up-a-month-report/ar-BBnaLfX?li=AAa0dzB"
-        data-id="132" data-m='{"i":132,"p":130,"n":"HeadlineItemViewModel","y":13,"l":"BBnaLfX","h":0,"v":"tv","c":"tv-celebrity","o":2}'  >
-        
-<img alt="Kim Kardashian West&#39;s due date likely moved up a month -- Report" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnav6R.img?h=166&amp;w=310&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=751&amp;y=450&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Steve Granitz/WireImage" />
-            <div class="caption">
-        <span class="title" >Report: Kim&#39;s due date likely moved up a month</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA5KWCN.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Wonderwall
-        </span>
-    </div>
-
-        
-    </a>
-
-                </li>
-                <li>
-                        <a   href="/en-us/tv/celebrity/emotional-martin-sheen-applauds-son-charlie-sheens-courage-for-hiv-announcement-it-was-the-most-difficult-thing-hed-ever-done/ar-BBna70H?li=AAa0dzB"
-        data-id="133" data-m='{"i":133,"p":130,"n":"HeadlineItemViewModel","y":13,"l":"BBna70H","h":0,"v":"tv","c":"tv-celebrity","o":3}'  >
-        
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBna4om.img?h=166&amp;w=310&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=392&amp;y=276&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by TIME Inc." />
-            <div class="caption">
-        <span class="title" >Martin Sheen applauds Charlie&#39;s courage</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBlPHfm.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            People
-        </span>
-    </div>
-
-        
-    </a>
-
-                </li>
-        </ul>
-        
-    </li>
-    <li class=" single   hasimage  media video"  data-aop="slide9>single "  data-id="134" data-m='{"i":134,"p":106,"n":"single","y":13,"o":9}' >
-            <a 
-         class="media video"
-        href="/en-us/video/lifestyle/flashy-and-fun-thanksgiving-nail-art/vi-CCeMuI"
-         data-id="135" data-m='{"i":135,"p":134,"n":"HeadlineItemViewModel","y":13,"l":"CCeMuI","h":0,"v":"video","c":"lifestyle","o":1}'  >
-        
-        
-
-<img alt="Flashy and fun Thanksgiving nail art" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CCeP4h.img?h=368&amp;w=622&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=676&amp;y=473&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Buzz60 Video" />
-    <div class="caption">
-        <span class="title" >Flashy and fun Thanksgiving nail art</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBhFV9y.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Buzz60
-        </span>
-    </div>
-        
-    </a>
-
-        
-    </li>
-    <li class=" head-to-head   hasimage  media photo"  data-aop="slide10>head-to-head "  data-id="136" data-m='{"i":136,"p":106,"n":"headtohead","y":13,"o":10}' >
-        
-
-            <h4>FOOD FACTS</h4>
-
-            <a   href="/en-us/foodanddrink/foodculture/11-things-you-didnt-know-about-red-meat/ss-CCa2fU"
-        data-id="137" data-m='{"i":137,"p":136,"n":"HeadlineItemViewModel","y":13,"l":"CCa2fU","h":0,"v":"foodanddrink","c":"foodculture","o":1}'  >
-        
-<img alt="&lt;p>A three-ounce serving of red meat (beef) provides you with half (about 25g) o..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CC9Y9q.img?h=333&amp;w=311&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Thinkstock" />
-            <div class="caption">
-        <span class="title" >Get the facts about red meat</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB5SfLo.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            The Daily Meal
-        </span>
-    </div>
-
-        
-    </a>
-
-
-    <a   href="/en-us/health/nutrition/8-surprising-sources-of-iron-that-arent-meat/ar-AAf9mq9?li=AAa0dzB"
-        data-id="138" data-m='{"i":138,"p":136,"n":"HeadlineItemViewModel","y":13,"l":"AAf9mq9","h":0,"v":"health","c":"nutrition","o":2}'  >
-        
-<img alt="Chickpeas" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAf9ryF.img?h=333&amp;w=311&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Greatist, Inc." />
-            <div class="caption">
-        <span class="title" >Sources of iron that aren&#39;t meat</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBlpjDa.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Greatist
-        </span>
-    </div>
-
-        
-    </a>
-        
-    </li>
-    <li class=" mosaic   hasimage "  data-aop="slide11>mosaic "  data-id="139" data-m='{"i":139,"p":106,"n":"mosaic","y":13,"o":11}' >
-        
-
-            <h4>Sports Buzz</h4>
-
-            <a   href="/en-us/sports/more-sports/one-armed-first-baseman-nephtali-flores-is-positively-amazing/ar-BBnav4W?li=AAa0dzB"
-        data-id="140" data-m='{"i":140,"p":139,"n":"HeadlineItemViewModel","y":13,"l":"BBnav4W","h":0,"v":"sports","c":"more_sports","o":1}'  >
-        
-<img alt="Nephtali Flores stars for Santa Ana&#39;s baseball team despite having just one arm ..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnasuR.img?h=333&amp;w=311&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=317&amp;y=199&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by USA Today Sports Media Group LLC" />
-            <div class="caption">
-        <span class="title" >One-armed first baseman is positively amazing</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB4kwB1.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            USA Today Sports
-        </span>
-    </div>
-
-        
-    </a>
-
-
-        <ul>
-                <li>
-                        <a   href="/en-us/sports/nba/why-rockets-fired-kevin-mchale/ar-BBnaysl?li=AAa0dzB"
-        data-id="141" data-m='{"i":141,"p":139,"n":"HeadlineItemViewModel","y":13,"l":"BBnaysl","h":0,"v":"sports","c":"basketball_nba","o":2}'  >
-        
-<img alt="Troy Taormina-USA TODAY Sports" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnauqS.img?h=166&amp;w=310&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1172&amp;y=427&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Troy Taormina-USA TODAY Sports" />
-            <div class="caption">
-        <span class="title" >Why the Rockets fired head coach McHale</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB4kwB1.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            USA Today Sports
-        </span>
-    </div>
-
-        
-    </a>
-
-                </li>
-                <li>
-                        <a   href="/en-us/sports/more-sports/michael-phelps-to-be-a-dad-pregnant-fianc%c3%a9e-nicole-johnson-expecting-baby-boy/ar-BBna5ph?li=AAa0dzB"
-        data-id="142" data-m='{"i":142,"p":139,"n":"HeadlineItemViewModel","y":13,"l":"BBna5ph","h":0,"v":"sports","c":"more_sports","o":3}'  >
-        
-<img alt="(Instagram)" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnagDo.img?h=166&amp;w=310&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=170&amp;y=83&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Gossip Cop" />
-            <div class="caption">
-        <span class="title" >Michael Phelps, fianc&#233;e expecting a baby boy</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBbyo1E.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Gossip Cop
-        </span>
-    </div>
-
-        
-    </a>
-
-                </li>
-        </ul>
-        
-    </li>
-    <li class=" single   hasimage  media photo"  data-aop="slide12>single "  data-id="143" data-m='{"i":143,"p":106,"n":"single","y":13,"o":12}' >
-            <a 
-         class="media photo"
-        href="/en-us/lifestyle/shopping/100-cool-gifts-under-dollar50-for-everyone-on-your-list/ss-BBn80JI"
-         data-id="144" data-m='{"i":144,"p":143,"n":"HeadlineItemViewModel","y":13,"l":"BBn80JI","h":0,"v":"lifestyle","c":"lifestyleshopping","o":1}'  >
-        
-        
-
-<img alt="&lt;p>Even plastic-bag apologists will get excited about four cheerful reusable tot..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn7L6t.img?h=368&amp;w=622&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1054&amp;y=1059&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Courtesy of Manufacturer" />
-    <div class="caption">
-        <span class="title" >100 Cool Gifts Under $50 for Everyone On Your List</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBiuKxg.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Redbook
-        </span>
-    </div>
-        
-    </a>
-
-        
-    </li>
-    <li class=" single   hasimage  media photo"  data-aop="slide13>single "  data-id="145" data-m='{"i":145,"p":106,"n":"single","y":13,"o":13}' >
-            <a 
-         class="media photo"
-        href="/en-us/health/nutrition/10-drinks-you-should-never-drink/ss-AAdl9Nj"
-         data-id="146" data-m='{"i":146,"p":145,"n":"HeadlineItemViewModel","y":13,"l":"AAdl9Nj","h":0,"v":"health","c":"nutrition","o":1}'  >
-        
-        
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAdkXdI.img?h=368&amp;w=622&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="HandmadePictures/Getty Images" />
-    <div class="caption">
-        <span class="title" >10 drinks you should never drink</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA9z9sE.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Good Housekeeping
-        </span>
-    </div>
-        
-    </a>
-
-        
-    </li>
-    <li class=" single   hasimage  media photo"  data-aop="slide14>single "  data-id="147" data-m='{"i":147,"p":106,"n":"single","y":13,"o":14}' >
-            <a 
-         class="media photo"
-        href="/en-us/lifestyle/home-and-garden/7-surprising-things-that-go-bad-over-time/ss-BBn5ehp"
-         data-id="148" data-m='{"i":148,"p":147,"n":"HeadlineItemViewModel","y":13,"l":"BBn5ehp","h":0,"v":"lifestyle","c":"lifestylehomeandgarden","o":1}'  >
-        
-        
-
-<img alt="&lt;p>Paint is another item that hangs out in many houses indefinitely. You may use..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn548R.img?h=368&amp;w=622&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=963&amp;y=730&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by MoneyTalksNews" />
-    <div class="caption">
-        <span class="title" >7 surprising things that go bad over time</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3IqoL.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            MoneyTalksNews
-        </span>
-    </div>
-        
-    </a>
-
-        
-    </li>
-    <li class=" single   hasimage "  data-aop="slide15>single "  data-id="149" data-m='{"i":149,"p":106,"n":"single","y":13,"o":15}' >
-            <a 
-        
-        href="/en-us/sports/nfl/joe-theismanns-broken-leg-30-years-later-remains-game-and-life-changer/ar-BBn0g5n?li=AAa0dzB"
-         data-id="150" data-m='{"i":150,"p":149,"n":"HeadlineItemViewModel","y":13,"l":"BBn0g5n","h":0,"v":"sports","c":"football_nfl","o":1}'  >
-        
-        
-
-<img alt="Washington quarterback Joe Theismann lies on the ground after he injured his rig..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn7Nq5.img?h=368&amp;w=622&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1150&amp;y=1508&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="AP Photo/J. Scott Applewhite" />
-    <div class="caption">
-        <span class="title" >Theismann&#39;s broken leg 30 years later remains life-changer</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA60ARV.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Orlando Sentinel
-        </span>
-    </div>
-        
-    </a>
-
-        
-    </li>
-    <li class=" head-to-head   hasimage "  data-aop="slide16>head-to-head "  data-id="151" data-m='{"i":151,"p":106,"n":"headtohead","y":13,"o":16}' >
-        
-
-            <h4>David Beckham</h4>
-
-            <a   href="/en-us/entertainment/celebrity/david-beckham-is-peoples-sexiest-man-alive/ar-BBn91rn?li=AAa0dzB"
-        data-id="152" data-m='{"i":152,"p":151,"n":"HeadlineItemViewModel","y":13,"l":"BBn91rn","h":0,"v":"entertainment","c":"entertainment-celebrity","o":1}'  >
-        
-<img alt="In this Monday, Sept. 28, 2015, file photo, David Beckham poses for photographer..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnacfW.img?h=333&amp;w=311&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1247&amp;y=529&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Joel Ryan/Invision/AP, File" />
-            <div class="caption">
-        <span class="title" >Beckham named People&#39;s &#39;Sexiest Man Alive&#39;</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBlPHfm.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            People
-        </span>
-    </div>
-
-        
-    </a>
-
-
-    <a   href="/en-us/lifestyle/celeb-style/david-beckham-the-quintessential-style-icon/ss-BBna6o2"
-        data-id="153" data-m='{"i":153,"p":151,"n":"HeadlineItemViewModel","y":13,"l":"BBna6o2","h":0,"v":"lifestyle","c":"lifestylecelebstyle","o":2}'  >
-        
-<img alt="40 times David Beckham was a style god" data-src="{&quot;default&quot;:&quot;//img.s-msn.com/tenant/amp/entityid/BBiUZf4.img?h=333&amp;w=311&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1037&amp;y=855&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="AFP/Getty Images" />
-            <div class="caption">
-        <span class="title" >Check out Beckham&#39;s 40 hottest looks</span>
-        <span class="sourcename">
-            
-            
-        </span>
-    </div>
-
-        
-    </a>
-        
-    </li>
-    <li class=" halfpane   hasimage "  data-aop="slide17>halfpane "  data-id="154" data-m='{"i":154,"p":106,"n":"halfpane","y":13,"o":17}' >
-        
-            <a   href="/en-us/money/realestate/middle-class-homebuyer-heres-how-to-get-help-with-your-down-payment/ar-CC8Mdv?li=AAa0dzB"
-        data-id="155" data-m='{"i":155,"p":154,"n":"HeadlineItemViewModel","y":13,"l":"CC8Mdv","h":0,"v":"finance","c":"finance-real-estate","o":1}'  >
-        
-<img alt="It is possible moving to another town would put you in line for a homebuyer assi..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CC96sT.img?h=368&amp;w=522&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1550&amp;y=316&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="PM Images/Getty Images" />
-            <div class="caption">
-        <span class="title" >Middle-class buyer? How to get help with down payment</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3IqoL.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            MoneyTalksNews
-        </span>
-    </div>
-
-        
-    </a>
-
-        <ul>
-                <li class="reltitle">REAL ESTATE</li>
-
-                <li>
-                        <a   href="http://www.msn.com/en-us/money/rates/mortgagerates"
-        data-id="156" data-m='{"i":156,"p":154,"n":"HeadlineItemViewModel","y":13,"o":2}'  >
-        
-
-            <div class="caption">
-        <span class="title" >Find the best refinance and mortgage rates for your home</span>
-        <span class="sourcename">
-            
-            
-        </span>
-    </div>
-
-        
-    </a>
-
-                </li>
-                <li>
-                        <a   href="http://www.msn.com/en-us/money/tools/mortgagecalculator"
-        data-id="157" data-m='{"i":157,"p":154,"n":"HeadlineItemViewModel","y":13,"o":3}'  >
-        
-
-            <div class="caption">
-        <span class="title" >Calculate your monthly mortgage payment</span>
-        <span class="sourcename">
-            
-            
-        </span>
-    </div>
-
-        
-    </a>
-
-                </li>
-                <li>
-                        <a   href="http://www.msn.com/en-us/money/realestate"
-        data-id="158" data-m='{"i":158,"p":154,"n":"HeadlineItemViewModel","y":13,"o":4}'  >
-        
-
-            <div class="caption">
-        <span class="title" >Get more real estate news and advice on MSN</span>
-        <span class="sourcename">
-            
-            
-        </span>
-    </div>
-
-        
-    </a>
-
-                </li>
-        </ul>
-        
-    </li>
-    <li class=" single   hasimage "  data-aop="slide18>single "  data-id="159" data-m='{"i":159,"p":106,"n":"single","y":13,"o":18}' >
-            <a 
-        
-        href="/en-us/money/companies/marriott-merger-has-starwood-lovers-nervous/ar-BBn96wr?li=AAa0dzB"
-         data-id="160" data-m='{"i":160,"p":159,"n":"HeadlineItemViewModel","y":13,"l":"BBn96wr","h":0,"v":"finance","c":"finance-companies","o":1}'  >
-        
-        
-
-<img alt="Charley Cullen Walters, an elite-level member of the Starwood Preferred Guest pr..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9nFw.img?h=368&amp;w=622&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=478&amp;y=915&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Monica Almeida/The New York Times" />
-    <div class="caption">
-        <span class="title" >Marriott merger has Starwood lovers nervous</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3l3r5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            The New York Times
-        </span>
-    </div>
-        
-    </a>
-
-        
-    </li>
-    <li class=" single   hasimage  media photo"  data-aop="slide19>single "  data-id="161" data-m='{"i":161,"p":106,"n":"single","y":13,"o":19}' >
-            <a 
-         class="media photo"
-        href="/en-us/entertainment/music/the-latin-grammy-awards-15-years-of-style/ss-BBmZSa7"
-         data-id="162" data-m='{"i":162,"p":161,"n":"HeadlineItemViewModel","y":13,"l":"BBmZSa7","h":0,"v":"entertainment","c":"music","o":1}'  >
-        
-        
-
-<img alt="Sofia Vergara arrives at the 12th Annual Latin Grammy Awards on Thursday Nov. 10..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmWirX.img?h=368&amp;w=622&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=752&amp;y=348&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="AP" />
-    <div class="caption">
-        <span class="title" >15 years of fab Latin Grammys fashion</span>
-        <span class="sourcename">
-            
-            
-        </span>
-    </div>
-        
-    </a>
-
-        
-    </li>
-    <li class=" triptych   hasimage  media photo"  data-aop="slide20>triptych "  data-id="163" data-m='{"i":163,"p":106,"n":"tryptic","y":13,"o":20}' >
-        
-
-            <h4>THANKSGIVING</h4>
-
-            <a   href="/en-us/lifestyle/family/13-things-to-never-discuss-at-thanksgiving-dinner/ss-BBeuYzM"
-        data-id="164" data-m='{"i":164,"p":163,"n":"HeadlineItemViewModel","y":13,"l":"BBeuYzM","h":0,"v":"lifestyle","c":"lifestylefamily","o":1}'  >
-        
-<img alt="Some people are childless by choice and others are simply unable to have childre..." data-src="{&quot;default&quot;:&quot;//img.s-msn.com/tenant/amp/entityid/BBeuWtQ.img?h=250&amp;w=206&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=360&amp;y=143&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Shutterstock" />
-            <div class="caption">
-        <span class="title" >Topics to avoid at Turkey Day dinner</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB5SfLo.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            The Daily Meal
-        </span>
-    </div>
-
-        
-    </a>
-
-
-    <a   href="/en-us/travel/tips/7-ways-to-make-thanksgiving-travel-easier/ar-CCftXh?li=AAa0dzB"
-        data-id="165" data-m='{"i":165,"p":163,"n":"HeadlineItemViewModel","y":13,"l":"CCftXh","h":0,"v":"travel","c":"traveltips","o":2}'  >
-        
-<img alt="7 ways to make Thanksgiving travel easier" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CCbpPl.img?h=250&amp;w=206&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=447&amp;y=236&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by MarketWatch" />
-            <div class="caption">
-        <span class="title" >Tips to make your holiday trip easier</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA44D41.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            MarketWatch
-        </span>
-    </div>
-
-        
-    </a>
-    <a   href="/en-us/foodanddrink/recipes/15-tasty-turkey-recipes-guaranteed-to-please-your-palate/ss-BBmKio8"
-        data-id="166" data-m='{"i":166,"p":163,"n":"HeadlineItemViewModel","y":13,"l":"BBmKio8","h":0,"v":"foodanddrink","c":"recipes","o":3}'  >
-        
-<img alt="Change up your turkey experience this year with this succulent combination of sa..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmK8da.img?h=250&amp;w=206&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=846&amp;y=1147&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Con Poulos" />
-            <div class="caption">
-        <span class="title" >Turkey recipes to inspire your meal</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA6oz5z.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Woman&#39;s Day
-        </span>
-    </div>
-
-        
-    </a>
-        
-    </li>
- </ul>
- 
-</div>
-
-</li>
- <li class="pos1" >
- 
-
- <div class="weatodaytile"  data-aop="todayWeatherSD_WeatherTodayThreeDaysTileModule" data-module-id="startpage|today|todaystripe|todayWeatherSD|WeatherTodayThreeDaysTileModule"  data-id="167" data-m='{"i":167,"p":105,"n":"WeatherTodayThreeDaysTileModule","y":4,"o":2}'>
-<a  href="/en-us/weather/today/Redmond,Washington,United-States/we-city-47.616,-122.181?iso=US" class="weacity" data-loc="lat=47.62&amp;long=-122.18&amp;c=Redmond&amp;st=Washington&amp;cn=United%20States&amp;iso=US&amp;type=1"  data-id="168" data-m='{"i":168,"p":105,"n":"WeatherTodayThreeDaysTileModule","y":4,"o":3}'   data-aop="city"><span>Redmond, Washington</span></a>
-
- 
- <div class="edit"  data-aop="change">
-<a class="edithome" href="#" data-degreetype="F"  data-id="169" data-m='{"i":169,"p":105,"n":"weathereditbtn","y":12,"o":4}'
-data-home="Search for Location / City" title="Change">Change</a>
-</div>
-<div class="weapopup"  data-aop="editweatherflyout"  data-region="editweatherflyout">
-<div class="weaddn wpopbg"></div>
-<div class="weaddn wpopctn">
-<a class="close"  data-id="170" data-m='{"i":170,"p":105,"n":"weatherTodayMiniClose","t":"CloseBtn","o":5}' role="button" href="#" title="Close">Close</a>
- 
-
-<div class="weaaddlocation">
-
-<form  data-id="171" data-m='{"i":171,"p":105,"n":"weasearchlocation","y":8,"o":6}' action="/en-us/weather/search" data-action="/en-us/weather/ajax/places/search/" method="get" >
- 
-<p>Set Home Location</p>
-<div class="add-loc-as-container">
-<input name="q" accesskey="L" autocomplete="off" type="search"
-value="" maxlength="250" data-auto-suggest-settings='{&quot;market&quot;:&quot;en-us&quot;,&quot;mode&quot;:&quot;AS&quot;,&quot;baseurl&quot;:&quot;/en-us/weather/today&quot;,&quot;method&quot;:&quot;custom&quot;,&quot;selector&quot;:&quot;.weaaddlocation&quot;,&quot;dataset&quot;:&quot;w8weather&quot;,&quot;urltype&quot;:&quot;GeoLocation&quot;,&quot;formcode&quot;:&quot;&quot;,&quot;lat&quot;:47.6162,&quot;lon&quot;:-122.1814}'
-                   placeholder="Search for Location / City" data-seemoretext="Press &lt;Enter&gt; to see more"
- data-id="172" data-m='{"i":172,"p":171,"n":"weaautosuggest","y":10,"o":1}' />
-<button title="Search" type="submit" class="searchbtn" value="search" role="button"
- data-id="173" data-m='{"i":173,"p":171,"n":"wealocationsearch","y":11,"o":2}'></button>
-</div>
-<div class="nolocerr" data-message="No search results for &#39;{0}&#39;"></div>
-<div class="errmsg">An unexpected error occurred, please try again.</div>
- 
-</form>
-</div>
-
- 
-
- <div>
-<p>Display Temperature In</p>
-<form class="setdegree"  data-id="174" data-m='{"i":174,"p":105,"n":"degreetype","y":12,"o":7}' action="/en-us/weather/ajax/places/savedegree/" method="get">
- 
-<div>
-<button name="weaDegreeType" id="fahrenheit" value="F"
-                        class="selected"
- data-id="175" data-m='{"i":175,"p":174,"n":"weafahrenheit","y":11,"o":1}'>
-<div class="dot"></div>
-</button>
-<label for="fahrenheit">Fahrenheit</label>
-            </div>
-            <div>
-                <button name="weaDegreeType" id="celsius" value="C"
-                        class=""
- data-id="176" data-m='{"i":176,"p":174,"n":"weacelsius","y":11,"o":2}'>
-<div class="dot"></div>
-</button>
-<label for="celsius">Celsius</label>
-</div>
- 
-</form>
-</div>
-
- <button  data-id="177" data-m='{"i":177,"p":105,"n":"weatherTodayMiniDone","t":"DoneBtn","o":8}' class="donebutton disabled" disabled="disabled" title="Done">Done</button>
- </div>
-</div>
-<ul>
- <li>
-<a  href="/en-us/weather/today/Redmond,Washington,United-States/we-city-47.616,-122.181?iso=US&amp;day=1"  data-id="178" data-m='{"i":178,"p":105,"n":"WeatherTodayThreeDaysTileModule","y":4,"o":9}'  data-aop="day1">
- <div id="weaalert" title="Alert">Alert</div>
-
-<div class="dt">
-Wed 18 </div>
-<img class="skycond" src="http://img-s-msn-com.akamaized.net/tenant/amp/entityid/BB8MIjP.img?m=6&amp;o=true&amp;u=true&amp;n=true&amp;w=40&amp;h=40"
-
-                             data-src="{&quot;default&quot;:&quot;http://img-s-msn-com.akamaized.net/tenant/amp/entityid/BB8MIjP.img?m=6&amp;o=true&amp;u=true&amp;n=true&amp;w=40&amp;h=40&quot;}"
-alt="Cloudy" title="Cloudy" data-icon="5" />
-<span class="temphigh">50&#176;</span>
-<span class="templow">43&#176;</span>
-</a>
-</li>
- <li>
-<a  href="/en-us/weather/today/Redmond,Washington,United-States/we-city-47.616,-122.181?iso=US&amp;day=2"  data-id="179" data-m='{"i":179,"p":105,"n":"WeatherTodayThreeDaysTileModule","y":4,"o":10}'  data-aop="day2">
-
-<div class="dt">
-Thu 19 </div>
-<img class="skycond" src="http://img-s-msn-com.akamaized.net/tenant/amp/entityid/BB8MIiC.img?m=6&amp;o=true&amp;u=true&amp;n=true&amp;w=40&amp;h=40"
-
-                             data-src="{&quot;default&quot;:&quot;http://img-s-msn-com.akamaized.net/tenant/amp/entityid/BB8MIiC.img?m=6&amp;o=true&amp;u=true&amp;n=true&amp;w=40&amp;h=40&quot;}"
-alt="Sunny" title="Sunny" data-icon="1" />
-<span class="temphigh">50&#176;</span>
-<span class="templow">36&#176;</span>
-</a>
-</li>
- <li>
-<a  href="/en-us/weather/today/Redmond,Washington,United-States/we-city-47.616,-122.181?iso=US&amp;day=3"  data-id="180" data-m='{"i":180,"p":105,"n":"WeatherTodayThreeDaysTileModule","y":4,"o":11}'  data-aop="day3">
-
-<div class="dt">
-Fri 20 </div>
-<img class="skycond" src="http://img-s-msn-com.akamaized.net/tenant/amp/entityid/BB8MKSg.img?m=6&amp;o=true&amp;u=true&amp;n=true&amp;w=40&amp;h=40"
-
-                             data-src="{&quot;default&quot;:&quot;http://img-s-msn-com.akamaized.net/tenant/amp/entityid/BB8MKSg.img?m=6&amp;o=true&amp;u=true&amp;n=true&amp;w=40&amp;h=40&quot;}"
-alt="Mostly Cloudy" title="Mostly Cloudy" data-icon="3" />
-<span class="temphigh">51&#176;</span>
-<span class="templow">39&#176;</span>
-</a>
-</li>
- </ul>
-</div>
-
-</li>
-    <li  class="pos2 replacead23 smalla smalla-twoimages media video"  data-id="181" data-m='{"i":181,"p":105,"n":"HeadlineItemViewModel","y":13,"l":"CC95Dw","h":0,"v":"video","c":"wonder","o":12}'  data-aop="river>1">
-        <a href="/en-us/video/wonder/scientists-have-figured-out-the-best-place-to-hide-in-a-zombie-apocalypse/vi-CC95Dw"
->
-<img alt="Scientists have figured out the best place to hide in a zombie apocalypse" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CC9a4u.img?h=250&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=848&amp;y=471&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Business Insider" /><img alt="Scientists have figured out the best place to hide in a zombie apocalypse" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CC9a4u.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=848&amp;y=471&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Business Insider" />
-                <div class="caption">
-        <span class="title" >Scientists have found the safest place to hide in a zombie apocalypse</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3dTgi.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Business Insider
-        </span>
-    </div>
-
-        </a>
-    </li>
-    <li  class="pos3 smalla "  data-id="182" data-m='{"i":182,"p":105,"n":"HeadlineItemViewModel","y":13,"l":"BBnau9o","h":0,"v":"news","c":"newscrime","o":13}'  data-aop="river>2">
-        <a href="/en-us/news/crime/illinois-officer-spent-embezzled-money-on-coffee-movies/ar-BBnau9o?li=BBgzzfc"
->
-<img alt="Charles Joseph Gliniewicz. Authorities say Gliniewicz died Tuesday, Sept. 1, 201..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnaDRD.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1359&amp;y=919&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Associated Press" />
-                <div class="caption">
-        <span class="title" >What dead Illinois officer spent embezzled money on</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA42Hq5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Associated Press
-        </span>
-    </div>
-
-        </a>
-    </li>
-    <li  class="pos4 smalla "  data-id="183" data-m='{"i":183,"p":105,"n":"HeadlineItemViewModel","y":13,"l":"BBn9LnH","h":0,"v":"news","c":"newspolitics","o":14}'  data-aop="river>3">
-        <a href="/en-us/news/politics/obama-names-jade-helm-rumors-as-most-entertaining-conspiracy-theory-about-him/ar-BBn9LnH?li=BBgzzfc"
->
-<img alt="A vehicle enters a gate at Texas Army National Guard Camp Swift, Wednesday, July..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAd1z6j.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=774&amp;y=666&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="AP Photo/Eric Gay" />
-                <div class="caption">
-        <span class="title" >Obama names most entertaining conspiracy theory about him</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB6Dp75.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            The Washington Post
-        </span>
-    </div>
-
-        </a>
-    </li>
-    <li  class=" mediuma "  data-id="184" data-m='{"i":184,"p":105,"n":"HeadlineItemViewModel","y":13,"l":"BBn7RdV","h":0,"v":"sports","c":"basketball_nba","o":15,"a":"mediuma Unknown"}'  data-aop="river>4">
-        <a href="/en-us/sports/nba/lamar-odom-is-confused-doesn%e2%80%99t-know-drugs-caused-brain-injury/ar-BBn7RdV?li=BBgzzfc" >
-<img alt="Khloe Kardashian recently revealed the extent of Lamar Odom&#39;s condition during a..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn81Iw.img?h=250&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1000&amp;y=486&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="David Liam Kyle/NBAE via Getty Images" /><img alt="Khloe Kardashian recently revealed the extent of Lamar Odom&#39;s condition during a..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn81Iw.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1000&amp;y=486&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="David Liam Kyle/NBAE via Getty Images" />
-                <div class="caption">
-        <span class="title" >Odom doesn?t know drugs caused brain injury</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB1uPMT.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Larry Brown Sports
-        </span>
-    </div>
-
-        </a>
-    </li>
-    <li  class="pos6 smalla media photo"  data-id="185" data-m='{"i":185,"p":105,"n":"HeadlineItemViewModel","y":13,"l":"BBn8pzY","h":0,"v":"weather","c":"weathertopstories","o":16}'  data-aop="river>5">
-        <a href="/en-us/weather/topstories/colorado-blizzard/ss-BBn8pzY"
->
-<img alt="A tow truck, right, pulls up to clear a tractor-trailer and sports utility vehic..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn8xon.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1032&amp;y=1121&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="David Zalubowski/AP" />
-                <div class="caption">
-        <span class="title" >Photos: Colorado slammed by first blizzard of the season</span>
-        <span class="sourcename">
-            
-            
-        </span>
-    </div>
-
-        </a>
-    </li>
-    <li  class="pos7 smalla media photo"  data-id="186" data-m='{"i":186,"p":105,"n":"HeadlineItemViewModel","y":13,"l":"CC87ga","h":0,"v":"autos","c":"autosmidsize","o":17}'  data-aop="river>6">
-        <a href="/en-us/autos/autos-midsize/20-best-selling-vehicles-in-america-%e2%80%94-november-edition/ss-CC87ga"
->
-<img alt="19. Jeep Cherokee" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CC822f.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1025&amp;y=779&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="FCA US LLC" />
-                <div class="caption">
-        <span class="title" >Best-Selling Vehicles in the US in October</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA9fheW.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Automotive Content Experience
-        </span>
-    </div>
-
-        </a>
-    </li>
-    <li  class="pos8 smalla "  data-id="187" data-m='{"i":187,"p":105,"n":"HeadlineItemViewModel","y":13,"l":"BBnatE5","h":0,"v":"news","c":"newsscienceandtechnology","o":18}'  data-aop="river>7">
-        <a href="/en-us/news/technology/scientists-witness-the-development-of-baby-planets-for-the-first-time/ar-BBnatE5?li=BBgzzfc"
->
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnar4Z.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=615&amp;y=807&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Popular Science" />
-                <div class="caption">
-        <span class="title" >Scientists witness the development of baby planets for first time</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3HSpU.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Popular Science
-        </span>
-    </div>
-
-        </a>
-    </li>
-    <li  class="pos9 smalla smalla-twoimages "  data-id="188" data-m='{"i":188,"p":105,"n":"HeadlineItemViewModel","y":13,"l":"BBn9fK0","h":0,"v":"finance","c":"finance-companies","o":19}'  data-aop="river>8">
-        <a href="/en-us/money/companies/fords-lincoln-brand-debuts-new-face-for-its-best-selling-model/ar-BBn9fK0?li=BBgzzfc"
->
-<img alt="Guest looks at a Ford Motor Co. Lincoln Continental concept car at an event ahea..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn8O9Y.img?h=250&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=371&amp;y=206&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="REUTERS/Brendan McDermid" /><img alt="Guest looks at a Ford Motor Co. Lincoln Continental concept car at an event ahea..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn8O9Y.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=371&amp;y=206&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="REUTERS/Brendan McDermid" />
-                <div class="caption">
-        <span class="title" >Ford's Lincoln brand debuts new face for its top model</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB2Bn.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Reuters
-        </span>
-    </div>
-
-        </a>
-    </li>
-    <li  class="pos10 smalla "  data-id="189" data-m='{"i":189,"p":105,"n":"HeadlineItemViewModel","y":13,"l":"BBn9JrF","h":0,"v":"finance","c":"finance-saving-investing","o":20}'  data-aop="river>9">
-        <a href="/en-us/money/savingandinvesting/warren-buffett-is-having-an-unusually-bad-year/ar-BBn9JrF?li=BBgzzfc"
->
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAfd02w.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1818&amp;y=853&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Chris Goodney/Bloomberg" />
-                <div class="caption">
-        <span class="title" >Warren Buffett is having an unusually bad year</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3ltd8.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            CNBC
-        </span>
-    </div>
-
-        </a>
-    </li>
-    <li  class="pos11 smalla "  data-id="190" data-m='{"i":190,"p":105,"n":"HeadlineItemViewModel","y":13,"l":"BBn9JUD","h":0,"v":"music","c":"musicnews","o":21}'  data-aop="river>10">
-        <a href="/en-us/music/news/carly-simon-reveals-who-youre-so-vain-verse-is-actually-about/ar-BBn9JUD?li=BBgzzfc"
->
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9JUB.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=318&amp;y=133&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Richard E. Aaron/Redferns" />
-                <div class="caption">
-        <span class="title" >Simon's 'You're So Vain' verse is about who?</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAesHLQ.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Entertainment Weekly
-        </span>
-    </div>
-
-        </a>
-    </li>
-    <li  class="pos12 smalla "  data-id="191" data-m='{"i":191,"p":105,"n":"HeadlineItemViewModel","y":13,"l":"BBn9s5W","h":0,"v":"finance","c":"technologyinvesting","o":22}'  data-aop="river>11">
-        <a href="/en-us/money/technologyinvesting/tech-ceo-fires-back-at-claim-that-his-startup-is-helping-isis/ar-BBn9s5W?li=BBgzzfc"
->
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9ueQ.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=jpg&amp;x=1157&amp;y=511&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Screen grab" />
-                <div class="caption">
-        <span class="title" >Tech CEO fires back at claim that his startup is helping ISIS</span>
-        <span class="sourcename">
-            <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA42urS.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
-            Business Insider
-        </span>
-    </div>
-
-        </a>
-    </li>
-     <li  class="todayshowcasead size234column">
-        
- <div  id="rectangle1_homepage_847fd579-ee70-47e5-a105-d264c2abe2e9"  class="ad"   data-aop="todayshowcasead_ad"  data-id="192" data-m='{"i":192,"p":105,"n":"todayshowcasead","t":"ad","o":23}' >
-<div class="outeradcontainer">
-<div  id="rectangle1_homepage_container_847fd579-ee70-47e5-a105-d264c2abe2e9" class="adcontainer" data-adjs='{"allowedViews":"SIZE234COLUMN"}'>
- <script class="sdkdapscript">
-                        require(["dap"], function (dap)
-                        {
- dap("&amp;AP=1089&amp;PG=MSNUSEN11&amp;PVGUID=cc7227b7f7fe4e3bb644226f3ef2c489&amp;PROVIDERID=7HD66FC", 300, 600, "rectangle1_homepage_container_847fd579-ee70-47e5-a105-d264c2abe2e9", {"isEnabled":0, "isDarkTheme":0}, {"scrollInit":true,"enableAdRefresh":true,"adaptiveRefresh":true,"adaptiveRefreshInterval":3000,"prid":"7HD66FC","rid":"cc7227b7f7fe4e3bb644226f3ef2c489"});
- });
-</script>
- </div>
-     <a href="http://go.microsoft.com/fwlink/?LinkID=286759" class="adchoices" target="_blank" data-piitxt="adchoices">
-        <span class="adchoiceicon"></span>
-        <span>AdChoices</span>
-    </a>
-
-</div>
-</div>
-
-    </li>
-
-         <li   class="pick pick1">
-            
- <div class="editorialheadline headlinelist  weather"  data-aop="editorsPick1_editorialHeadlines" data-module-id="startpage|today|todaystripe|editorsPick1|editorialHeadlines" data-uipr="1"  data-id="193" data-m='{"i":193,"p":105,"n":"editorsPick1","t":"editorialHeadlines","o":24}'>
- 
- <h3><a href="http://www.msn.com/en-us/news"  data-id="194" data-m='{"i":194,"p":193,"n":"HeadlineItemViewModel","y":13,"o":1}'>EDITORS&#39; PICKS</a></h3>
-<ul>
- <li>
-<a href="/en-us/weather/topstories/warm-winter-ahead-polar-vortex-says-maybe-not/ar-BBn9iXJ?li=BBieTUX"  data-id="195" data-m='{"i":195,"p":193,"n":"HeadlineItemViewModel","y":13,"l":"BBn9iXJ","h":0,"v":"weather","c":"weathertopstories","o":2}'>
-<span >Warm winter ahead? Polar vortex says maybe not</span>
- <span>Reuters</span>
-</a>
-</li>
- <li>
-<a href="/en-us/health/medical/6-mad-scientists-who-ended-up-being-right/ar-BBn9rP4?li=BBieTUX"  data-id="196" data-m='{"i":196,"p":193,"n":"HeadlineItemViewModel","y":13,"l":"BBn9rP4","h":0,"v":"health","c":"medical","o":3}'>
-<span >6 Mad Scientists Who Ended Up Being Right</span>
- <span>Medical Daily</span>
-</a>
-</li>
- <li>
-<a href="/en-us/news/us/feds-seize-hundreds-of-tamales-smuggled-from-mexico/ar-BBna7w6?li=BBieTUX"  data-id="197" data-m='{"i":197,"p":193,"n":"HeadlineItemViewModel","y":13,"l":"BBna7w6","h":0,"v":"news","c":"newsus","o":4}'>
-<span >Feds seize hundreds of tamales smuggled from Mexico</span>
- <span>The Hill</span>
-</a>
-</li>
- <li>
-<a href="/en-us/sports/more-sports/watch-a-high-school-kicker-nail-a-record-breaking-63-yard-fg-in-a-playoff-game/vi-BBn8cPX"  data-id="198" data-m='{"i":198,"p":193,"n":"HeadlineItemViewModel","y":13,"l":"BBn8cPX","h":0,"v":"sports","c":"more_sports","o":5}'>
-<span >Watch high school kicker nail record-breaking 63-yard FG (video)</span>
- <span>FOXSports</span>
-</a>
-</li>
- </ul>
- 
-</div>
-
-        </li>
-        <li   class="pick pick2">
-            
- <div class="editorialheadline headlinelist  sports"  data-aop="editorsPick2_editorialHeadlines" data-module-id="startpage|today|todaystripe|editorsPick2|editorialHeadlines" data-uipr="1"  data-id="199" data-m='{"i":199,"p":105,"n":"editorsPick2","t":"editorialHeadlines","o":25}'>
- 
- <h3><a href="http://www.msn.com/en-us/video"  data-id="200" data-m='{"i":200,"p":199,"n":"HeadlineItemViewModel","y":13,"o":1}'>TRENDING VIDEO</a></h3>
-<ul>
- <li>
-<a href="/en-us/news/other/husband-of-9-11-hero-returns-women-of-the-year-award-after-glamour-honors-caitlyn-jenner/vi-BBn4RNL"  data-id="201" data-m='{"i":201,"p":199,"n":"HeadlineItemViewModel","y":13,"l":"BBn4RNL","h":0,"v":"news","c":"other","o":2}'>
-<span >Husband of 9/11 Hero Returns Award After &#39;Glamour&#39; Honors Caitlyn Jenner</span>
- <span>ETOnline</span>
-</a>
-</li>
- <li>
-<a href="/en-us/sports/mma/fighters-celebrate-rousey-loss/vi-BBn2FsC"  data-id="202" data-m='{"i":202,"p":199,"n":"HeadlineItemViewModel","y":13,"l":"BBn2FsC","h":0,"v":"sports","c":"mma","o":3}'>
-<span >Fighters Celebrate Rousey Loss</span>
- <span>120 Sports</span>
-</a>
-</li>
- <li>
-<a href="/en-us/money/video/are-outlet-stores-a-waste-of-time-and-money/vi-BBmJZ2u"  data-id="203" data-m='{"i":203,"p":199,"n":"HeadlineItemViewModel","y":13,"l":"BBmJZ2u","h":0,"v":"finance","c":"finance-video","o":4}'>
-<span >Are Outlet Stores a Waste of Time and Money?</span>
- <span>MoneyTalksNews</span>
-</a>
-</li>
- <li>
-<a href="/en-us/video/wonder/scientist-claim-there-is-evidence-of-alternate-universes/vi-BBmKvf3"  data-id="204" data-m='{"i":204,"p":199,"n":"HeadlineItemViewModel","y":13,"l":"BBmKvf3","h":0,"v":"video","c":"wonder","o":5}'>
-<span >Scientist claim there is evidence of alternate universes</span>
- <span>Buzz60</span>
-</a>
-</li>
- </ul>
- 
-</div>
-
-        </li>
-        <li   class="pick pick3">
-            
- <div class="editorialheadline headlinelist"  data-aop="editorsPick3_editorialHeadlines" data-module-id="startpage|today|todaystripe|editorsPick3|editorialHeadlines" data-uipr="1"  data-id="205" data-m='{"i":205,"p":105,"n":"editorsPick3","t":"editorialHeadlines","o":26}'>
- 
- <h3><a href="http://www.msn.com/en-us/foodanddrink"  data-id="206" data-m='{"i":206,"p":205,"n":"HeadlineItemViewModel","y":13,"o":1}'>TURKEY DAY FOR EVERYONE</a></h3>
-<ul>
- <li>
-<a href="/en-us/foodanddrink/foodculture/16-hilarious-thanksgiving-fails-youll-be-thankful-arent-yours/ss-BBmSOIn"  data-id="207" data-m='{"i":207,"p":205,"n":"HeadlineItemViewModel","y":13,"l":"BBmSOIn","h":0,"v":"foodanddrink","c":"foodculture","o":2}'>
-<span >16 Hilarious Thanksgiving Fails You&#39;ll Be Thankful Aren&#39;t Yours</span>
- <span>Delish</span>
-</a>
-</li>
- <li>
-<a href="/en-us/lifestyle/pets/12-most-dangerous-foods-for-dogs-and-cats/ss-BBh0Ak7"  data-id="208" data-m='{"i":208,"p":205,"n":"HeadlineItemViewModel","y":13,"l":"BBh0Ak7","h":0,"v":"lifestyle","c":"lifestylepets","o":3}'>
-<span >12 Most Dangerous People Foods for Dogs &amp; Cats</span>
- <span>Mom.me</span>
-</a>
-</li>
- <li>
-<a href="/en-us/foodanddrink/foodculture/10-things-you-didn%e2%80%99t-know-about-cranberries-and-cranberry-bogs/ss-CC95bb"  data-id="209" data-m='{"i":209,"p":205,"n":"HeadlineItemViewModel","y":13,"l":"CC95bb","h":0,"v":"foodanddrink","c":"foodculture","o":4}'>
-<span >10 Things You Didn?t Know About Cranberries and Cranberry Bogs</span>
- <span>The Daily Meal</span>
-</a>
-</li>
- <li>
-<a href="/en-us/foodanddrink/recipes/7-crazy-good-mashed-potato-mix-ins/ss-BBmYa9o"  data-id="210" data-m='{"i":210,"p":205,"n":"HeadlineItemViewModel","y":13,"l":"BBmYa9o","h":0,"v":"foodanddrink","c":"recipes","o":5}'>
-<span >7 Crazy-Good Mashed Potato Mix-Ins</span>
- <span>Delish</span>
-</a>
-</li>
- </ul>
- 
-</div>
-
-        </li>
-        <li   class="pick pick4">
-            
- <div class="editorialheadline headlinelist"  data-aop="editorsPick4_editorialHeadlines" data-module-id="startpage|today|todaystripe|editorsPick4|editorialHeadlines" data-uipr="1"  data-id="211" data-m='{"i":211,"p":105,"n":"editorsPick4","t":"editorialHeadlines","o":27}'>
- 
- <h3><a href="http://www.msn.com/en-us/travel"  data-id="212" data-m='{"i":212,"p":211,"n":"HeadlineItemViewModel","y":13,"o":1}'>ALL ABOUT BABY NAMES</a></h3>
-<ul>
- <li>
-<a href="/en-us/lifestyle/family/the-worlds-most-popular-baby-name-is-classic-and-beautiful/ar-CC8yKA?li=BBieRxq"  data-id="213" data-m='{"i":213,"p":211,"n":"HeadlineItemViewModel","y":13,"l":"CC8yKA","h":0,"v":"lifestyle","c":"lifestylefamily","o":2}'>
-<span >The World&#39;s Most Popular Baby Name is Classic and Beautiful</span>
- <span>SheKnows</span>
-</a>
-</li>
- <li>
-<a href="/en-us/lifestyle/family/10-baby-names-inspired-by-the-simpsons/ss-AAeJ75G"  data-id="214" data-m='{"i":214,"p":211,"n":"HeadlineItemViewModel","y":13,"l":"AAeJ75G","h":0,"v":"lifestyle","c":"lifestylefamily","o":3}'>
-<span >10 Baby Names Inspired By &#39;The Simpsons&#39;</span>
- <span>Mom.me</span>
-</a>
-</li>
- <li>
-<a href="/en-us/lifestyle/video/good-question-what-makes-a-baby-name-popular/vi-BBgpxhW"  data-id="215" data-m='{"i":215,"p":211,"n":"HeadlineItemViewModel","y":13,"l":"BBgpxhW","h":0,"v":"lifestyle","c":"lifestylevideo","o":4}'>
-<span >Good Question: What Makes A Baby Name Popular?</span>
- <span>CBS Minnesota</span>
-</a>
-</li>
- <li>
-<a href="/en-us/lifestyle/family/millennial-parents-starting-new-baby-naming-trend/ar-BBmCTUr?li=BBieRxq"  data-id="216" data-m='{"i":216,"p":211,"n":"HeadlineItemViewModel","y":13,"l":"BBmCTUr","h":0,"v":"lifestyle","c":"lifestylefamily","o":5}'>
-<span >Millennial Parents Starting New Baby Naming Trend</span>
- <span>Mom.me</span>
-</a>
-</li>
- </ul>
- 
-</div>
-
-        </li>
-
-</ul>
- 
-</div>
-
- <div id="refreshbar" class="custombanner" title="refresh page"  data-id="217" data-m='{"i":217,"p":19,"n":"UIPR_render","y":8,"o":5}'  data-aop="uipr_bar">
- 
-<div class="refreshbody">
-<a href="http://www.msn.com:80/"  data-id="218" data-m='{"i":218,"p":217,"n":"UIPR_button","y":11,"o":1}'>
-<span class="icon reset"></span>
-<span class="text">New content is available. <span class="underline">Click here to refresh the page.</span></span>
-<span class="button">REFRESH</span>
-</a>
-<a href="#" class="icon delete"  data-id="219" data-m='{"i":219,"p":217,"n":"UIPR_close","y":11,"o":2}' title="close"></a>
-</div>
- 
-</div>
-
- 
-        <script>
-            window._flushTimings && (window._flushTimings.ContentEnd = new Date - window.performance.timing.navigationStart);
-        </script>
-
- <div class='normalsection'  data-section-id="shoppingmodule"><div class='full-width'><div class='sectioncontent'  data-region="shoppingmodule_section">
- <div  id="banner3_homepage_edd744ff-6b7e-4739-a9bb-cca86cf37d80"  class="widead"   data-aop="shoppingmodule.ad_ad"  data-id="220" data-m='{"i":220,"p":19,"n":"ShoppingModule.ad","t":"ad","o":6}' >
-<div class="outeradcontainer">
-<div  id="banner3_homepage_container_edd744ff-6b7e-4739-a9bb-cca86cf37d80" class="adcontainer" data-adjs='{"allowedViews":"SIZE234COLUMN"}'>
- <script class="sdkdapscript">
-                        require(["dap"], function (dap)
-                        {
- dap("&amp;AP=1402&amp;PG=TSTPRMUS32&amp;PVGUID=cc7227b7f7fe4e3bb644226f3ef2c489&amp;PROVIDERID=7HD66FC", 1, 1, "banner3_homepage_container_edd744ff-6b7e-4739-a9bb-cca86cf37d80", {"isEnabled":0, "isDarkTheme":0}, {"scrollInit":true,"enableAdRefresh":true,"adaptiveRefresh":true,"adaptiveRefreshInterval":3000,"prid":"7HD66FC","rid":"cc7227b7f7fe4e3bb644226f3ef2c489"});
- });
-</script>
- </div>
-     <a href="http://go.microsoft.com/fwlink/?LinkID=286759" class="adchoices" target="_blank" data-piitxt="adchoices">
-        <span class="adchoiceicon"></span>
-        <span>AdChoices</span>
-    </a>
-
-</div>
-</div>
-</div></div></div>    <div  class="stripecontainer"  data-nativead="40_news_.stripecontent .tertiary li:nth-child(3)" data-section-id="stripe.news"  data-section-id="stripe.news">
-        <div class="news stripeouter"  data-aop="stripe.news_stripe"  data-id="221" data-m='{"i":221,"p":19,"n":"stripe.news","t":"stripe","o":7}'>
-            
-                <button class="leftarrow"  data-id="222" data-m='{"i":222,"p":221,"n":"leftarrow","y":12,"o":1}'></button>
-            <div class="stripe full-width">
-                
- <div class="stripenav"  data-aop="stripe.news.navigation_stripenavigation"  data-id="223" data-m='{"i":223,"p":221,"n":"stripe.news.navigation","t":"stripeNavigation","o":2}'>
- 
-<ul>
- <li  data-id="224" data-m='{"i":224,"p":223,"n":"news","y":4,"o":1}'><h2><a href="/en-us/news"  data-id="225" data-m='{"i":225,"p":223,"n":"news","y":4,"o":2}'>News</a></h2></li>
-  <li  class="hide12"  data-id="226" data-m='{"i":226,"p":223,"n":"listlink","y":4,"l":"MY TOPICS","o":3}'><a href="/en-us/news/topics">MY TOPICS</a></li>
- <li  class="hide12"  data-id="227" data-m='{"i":227,"p":223,"n":"listlink","y":4,"l":"US","o":4}'><a href="/en-us/news/us">US</a></li>
- <li  class="hide12"  data-id="228" data-m='{"i":228,"p":223,"n":"listlink","y":4,"l":"WORLD","o":5}'><a href="/en-us/news/world">WORLD</a></li>
- <li  class="hide12"  data-id="229" data-m='{"i":229,"p":223,"n":"listlink","y":4,"l":"CRIME","o":6}'><a href="/en-us/news/crime/">CRIME</a></li>
- <li  class="hide12"  data-id="230" data-m='{"i":230,"p":223,"n":"listlink","y":4,"l":"LOCAL","o":7}'><a href="/en-us/news/local">LOCAL</a></li>
- <li  class="hide123"  data-id="231" data-m='{"i":231,"p":223,"n":"listlink","y":4,"l":"OFFBEAT","o":8}'><a href="/en-us/news/offbeat">OFFBEAT</a></li>
- <li  class="hide123"  data-id="232" data-m='{"i":232,"p":223,"n":"listlink","y":4,"l":"TECHNOLOGY","o":9}'><a href="/en-us/news/technology">TECHNOLOGY</a></li>
- <li  class="hide123"  data-id="233" data-m='{"i":233,"p":223,"n":"listlink","y":4,"l":"POLITICS","o":10}'><a href="/en-us/news/politics">POLITICS</a></li>
- <li  class="hide123"  data-id="234" data-m='{"i":234,"p":223,"n":"listlink","y":4,"l":"OPINION","o":11}'><a href="/en-us/news/opinion">OPINION</a></li>
- <li  class="hide123"  data-id="235" data-m='{"i":235,"p":223,"n":"listlink","y":4,"l":"WEEKEND READS","o":12}'><a href="/en-us/news/weekendreads">WEEKEND READS</a></li>
- <li  class="hide123"  data-id="236" data-m='{"i":236,"p":223,"n":"listlink","y":4,"l":"VIDEO","o":13}'><a href="/en-us/news/video">VIDEO</a></li>
- </ul>
- <div class="stripemenu">
-<button class="edit"  data-id="237" data-m='{"i":237,"p":223,"n":"personalization","t":"dropdown","o":14}'>Edit</button>
- <button  data-id="238" data-m='{"i":238,"p":223,"n":"remove","t":"dropdownitem","o":15}' class="remove">Remove Section</button>
- <button  data-id="239" data-m='{"i":239,"p":223,"n":"moveup","t":"dropdownitem","o":16}' class="up">Move Section Up</button>
-<button  data-id="240" data-m='{"i":240,"p":223,"n":"movedown","t":"dropdownitem","o":17}' class="down">Move Section Down</button>
- <button  data-id="241" data-m='{"i":241,"p":223,"n":"addbelow","t":"dropdownitem","o":18}' class="add">Add Section Below</button>
- </div>
- 
-</div>
-    <div class="paging-container">
-
- <div  class="stripecontent normaldensity"  data-module-id="startpage|stripe.news|stripe|stripe.news.topStories|headlines"  data-aop="top stories"  data-id="242" data-m='{"i":242,"p":221,"n":"stripe.news.topStories","t":"headlines","o":3}'>
- 
- <ul class="secondary"  data-aop="secondary"  data-id="243" data-m='{"i":243,"p":242,"n":"secondary","y":8,"o":1}'>
- <li  data-id="244" data-m='{"i":244,"p":243,"n":"HeadlineItemViewModel","y":13,"l":"BBna2FK","h":0,"v":"news","c":"newsus","o":1}'  >
-<a href="/en-us/news/us/aaa-nearly-47m-will-travel-for-thanksgiving/ar-BBna2FK?li=AA54ur"  >
-<img alt="In this Nov. 25, 2014 file photo, travelers check in their luggage as they prepa..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnacJD.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1887&amp;y=531&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="AP Photo/Alan Diaz, File" /> <div>
-<h4 >AAA: Nearly 47M will travel for Thanksgiving</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBktwsD.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>USA Today</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="245" data-m='{"i":245,"p":242,"n":"tertiary","y":8,"o":2}'>
- <li  data-id="246" data-m='{"i":246,"p":245,"n":"HeadlineItemViewModel","y":13,"l":"BBn9fxT","h":0,"v":"news","c":"newsus","o":1}'  >
-<a href="/en-us/news/us/3-killed-thousands-without-power-in-northwest-windstorm/ar-BBn9fxT?li=AA54ur"  >
-<img alt=", Tuesday, Nov. 17, 2015, as a storm sweeps through the area. Rain and high wind..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9d23.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1538&amp;y=606&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Associated Press" /> <div>
-<h4 >3 killed, thousands without power in Northwest windstorm</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA42Hq5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Associated Press</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="247" data-m='{"i":247,"p":245,"n":"HeadlineItemViewModel","y":13,"l":"BBnaqeV","h":0,"v":"news","c":"newsus","o":2}'  >
-<a href="/en-us/news/us/the-nypd-says-its-illegal-to-ride-a-hoverboard-on-the-streets-of-new-york/ar-BBnaqeV?li=AA54ur"  >
-<img alt="Hoverboard" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnaqeS.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1123&amp;y=1029&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Business Insider Inc" /> <div>
-<h4 >NYPD: Hoverboards are illegal on the streets of NYC</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBlfFAC.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Tech Insider</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="248" data-m='{"i":248,"p":245,"n":"HeadlineItemViewModel","y":13,"l":"BBn9ho1","h":0,"v":"news","c":"newsworld","o":3}'  >
-<a href="/en-us/news/world/china-tells-obama-to-keep-out-of-south-china-sea-disputes/ar-BBn9ho1?li=AA54ur"  >
-<img alt="Two MV-22 Ospreys land on the flight deck of the aircraft carrier USS Theodore R..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9hnZ.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=406&amp;y=265&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by AFP" /> <div>
-<h4 >China tells Obama to keep out of South China Sea disputes</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB74fLs.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>AFP</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="249" data-m='{"i":249,"p":242,"n":"tertiary","y":8,"o":3}'>
- <li  data-id="250" data-m='{"i":250,"p":249,"n":"HeadlineItemViewModel","y":13,"l":"BBn8rQE","h":0,"v":"news","c":"newsworld","o":1}'  >
-<a href="/en-us/news/world/chief-suspect-is-an-isis-militant-whose-own-family-wished-him-dead/ar-BBn8rQE?li=AA54ur"  >
-<img alt="Abdelhamid Abaaoud" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn8rQC.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=229&amp;y=204&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="via Reuters" /> <div>
-<h4 >Chief Suspect Is an ISIS Militant Whose Own Family Wished Him Dead</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3l3r5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>The New York Times</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="251" data-m='{"i":251,"p":249,"n":"HeadlineItemViewModel","y":13,"l":"BBn9Nqf","h":0,"v":"news","c":"newsus","o":2}'  >
-<a href="/en-us/news/us/why-texas-county-known-for-death-sentences-has-given-none-in-2015/ar-BBn9Nqf?li=AA54ur"  >
-<img alt="Members of the Harris County Sheriff&#39;s department work outside the scene of a sh..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9M6O.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=458&amp;y=367&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="AP Photo/David J. Phillip" /> <div>
-<h4 >Why a Texas county known for death sentences has given none in 2015</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBbFRBf.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>The Guardian</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="252" data-m='{"i":252,"p":249,"n":"HeadlineItemViewModel","y":13,"l":"BBn9JdC","h":0,"v":"news","c":"newsworld","o":3}'  >
-<a href="/en-us/news/world/supernumberjesuischien-goes-viral-in-honor-of-dog-killed-during-france-raid/ar-BBn9JdC?li=AA54ur"  >
-<img alt="A seven-year-old Belgian Shepherd named ?Diesel? was killed during the raid in t..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9Muv.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=611&amp;y=385&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Police Nationale via Twitter" /> <div>
-<h4 >#JeSuisChien Goes Viral In Honor Of Dog Killed During France Raid</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3dVQj.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>The Huffington Post</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="secondary"  data-aop="secondary"  data-id="253" data-m='{"i":253,"p":242,"n":"secondary","y":8,"o":4}'>
- <li  data-id="254" data-m='{"i":254,"p":253,"n":"HeadlineItemViewModel","y":13,"l":"BB1F1yA","h":0,"v":"news","c":"newsworld","o":1}'   class="media photo"   >
-<a href="/en-us/news/world/image-of-the-day/ss-BB1F1yA"  >
-<img alt="People perform during a protest against the Brazilian mining company Vale, in Ri..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9BB7.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1650&amp;y=856&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Mohamed Al Hwaity/Reuters" /> <div>
-<h4 >Image of the Day</h4>
-
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- 
-</div>
-    </div>
-
-                <div class="paging"></div>
-            </div>
-                <button class="rightarrow"  data-id="255" data-m='{"i":255,"p":221,"n":"rightarrow","y":12,"o":4}'></button>
-            
-        </div>
-    </div>
-<div class='normalsection'  data-section-id="bannerad1"><div class='full-width'><div class='sectioncontent'  data-region="bannerad1_section">
- <div  id="banner4_homepage_b004e39b-27f2-462e-b694-0aa8839a195f"  class="widead"   data-aop="bannerad1.ad_ad"  data-id="256" data-m='{"i":256,"p":19,"n":"BannerAd1.ad","t":"ad","o":8}' >
-<div class="outeradcontainer">
-<div  id="banner4_homepage_container_b004e39b-27f2-462e-b694-0aa8839a195f" class="adcontainer" data-adjs='{"allowedViews":"SIZE234COLUMN"}'>
- <script class="sdkdapscript">
-                        require(["dap"], function (dap)
-                        {
- dap("&amp;AP=1402&amp;PG=MSNUSEN14&amp;PVGUID=cc7227b7f7fe4e3bb644226f3ef2c489&amp;PROVIDERID=7HD66FC", 1, 1, "banner4_homepage_container_b004e39b-27f2-462e-b694-0aa8839a195f", {"isEnabled":0, "isDarkTheme":0}, {"scrollInit":true,"enableAdRefresh":true,"adaptiveRefresh":true,"adaptiveRefreshInterval":3000,"prid":"7HD66FC","rid":"cc7227b7f7fe4e3bb644226f3ef2c489"});
- });
-</script>
- </div>
-     <a href="http://go.microsoft.com/fwlink/?LinkID=286759" class="adchoices" target="_blank" data-piitxt="adchoices">
-        <span class="adchoiceicon"></span>
-        <span>AdChoices</span>
-    </a>
-
-</div>
-</div>
-</div></div></div>    <div  class="stripecontainer"  data-nativead="40_entertainment_.stripecontent .tertiary li:nth-child(3)" data-section-id="stripe.entertainment"  data-section-id="stripe.entertainment">
-        <div class="entertainment stripeouter"  data-aop="stripe.entertainment_stripe"  data-id="257" data-m='{"i":257,"p":19,"n":"stripe.entertainment","t":"stripe","o":9}'>
-            
-                <button class="leftarrow"  data-id="258" data-m='{"i":258,"p":257,"n":"leftarrow","y":12,"o":1}'></button>
-            <div class="stripe full-width">
-                
- <div class="stripenav"  data-aop="stripe.entertainment.navigation_stripenavigation"  data-id="259" data-m='{"i":259,"p":257,"n":"stripe.entertainment.navigation","t":"stripeNavigation","o":2}'>
- 
-<ul>
- <li  data-id="260" data-m='{"i":260,"p":259,"n":"entertainment","y":4,"o":1}'><h2><a href="/en-us/entertainment"  data-id="261" data-m='{"i":261,"p":259,"n":"entertainment","y":4,"o":2}'>Entertainment</a></h2></li>
-  <li  class="hide12"  data-id="262" data-m='{"i":262,"p":259,"n":"entertainment-celebrity","y":4,"o":3}'><a href="/en-us/entertainment/celebrity">CELEBRITY</a></li>
- <li  class="hide12"  data-id="263" data-m='{"i":263,"p":259,"n":"tv","y":4,"o":4}'><a href="/en-us/tv">TV</a></li>
- <li  class="hide12"  data-id="264" data-m='{"i":264,"p":259,"n":"movies","y":4,"o":5}'><a href="/en-us/movies">MOVIES</a></li>
- <li  class="hide12"  data-id="265" data-m='{"i":265,"p":259,"n":"music","y":4,"o":6}'><a href="/en-us/music">MUSIC</a></li>
- <li  class="hide12"  data-id="266" data-m='{"i":266,"p":259,"n":"games","y":4,"o":7}'><a href="http://zone.msn.com/">GAMES</a></li>
- <li  class="hide123"  data-id="267" data-m='{"i":267,"p":259,"n":"news","y":4,"o":8}'><a href="/en-us/entertainment/news">NEWS</a></li>
- <li  class="hide123"  data-id="268" data-m='{"i":268,"p":259,"n":"video","y":4,"o":9}'><a href="/en-us/entertainment/video">VIDEO</a></li>
- <li  class="hide123"  data-id="269" data-m='{"i":269,"p":259,"n":"awards","y":4,"o":10}'><a href="/en-us/entertainment/awards">AWARDS</a></li>
- </ul>
- <div class="stripemenu">
-<button class="edit"  data-id="270" data-m='{"i":270,"p":259,"n":"personalization","t":"dropdown","o":11}'>Edit</button>
- <button  data-id="271" data-m='{"i":271,"p":259,"n":"remove","t":"dropdownitem","o":12}' class="remove">Remove Section</button>
- <button  data-id="272" data-m='{"i":272,"p":259,"n":"moveup","t":"dropdownitem","o":13}' class="up">Move Section Up</button>
-<button  data-id="273" data-m='{"i":273,"p":259,"n":"movedown","t":"dropdownitem","o":14}' class="down">Move Section Down</button>
- <button  data-id="274" data-m='{"i":274,"p":259,"n":"addbelow","t":"dropdownitem","o":15}' class="add">Add Section Below</button>
- </div>
- 
-</div>
-    <div class="paging-container">
-
- <div  class="stripecontent normaldensity"  data-module-id="startpage|stripe.entertainment|stripe|stripe.entertainment.hero|headlines"  data-aop="hero"  data-id="275" data-m='{"i":275,"p":257,"n":"stripe.entertainment.hero","t":"headlines","o":3}'>
- 
- <ul class="secondary"  data-aop="secondary"  data-id="276" data-m='{"i":276,"p":275,"n":"secondary","y":8,"o":1}'>
- <li  data-id="277" data-m='{"i":277,"p":276,"n":"HeadlineItemViewModel","y":13,"l":"BBn6Lm4","h":0,"v":"movies","c":"movies-gallery","o":1}'   class="media photo"   >
-<a href="/en-us/movies/gallery/55-movies-you-have-to-watch-by-the-time-youre-30/ss-BBn6Lm4"  >
-<img alt="Lost in Translation (2003)" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn5cIn.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=189&amp;y=96&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="YouTube" /> <div>
-<h4 >55 Movies You Have to Watch by the Time You&#39;re 30</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBiuMZc.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Marie Claire</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- 
-</div>
-
- <div  class="stripecontent normaldensity"  data-module-id="startpage|stripe.entertainment|stripe|stripe.entertainment.topStories|headlines"  data-aop="top stories"  data-id="278" data-m='{"i":278,"p":257,"n":"stripe.entertainment.topStories","t":"headlines","o":4}'>
- 
- <ul class="tertiary"  data-aop="tertiary"  data-id="279" data-m='{"i":279,"p":278,"n":"tertiary","y":8,"o":1}'>
- <li  data-id="280" data-m='{"i":280,"p":279,"n":"HeadlineItemViewModel","y":13,"l":"BBn9Kdf","h":0,"v":"movies","c":"movienews","o":1}'  >
-<a href="/en-us/movies/news/12-movies-you-pretend-to-love-but-will-never-watch-again/ar-BBn9Kdf?li=AA59yv"  >
-<img alt="12 Movies You Pretend To Love But Will Never Watch Again" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9Hkk.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=291&amp;y=155&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="YouTube" /> <div>
-<h4 >12 Movies You Pretend To Love But Will Never Watch Again</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBglpFq.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Mandatory</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="281" data-m='{"i":281,"p":279,"n":"HeadlineItemViewModel","y":13,"l":"BBn8AxR","h":0,"v":"movies","c":"movies-gallery","o":2}'   class="media photo"   >
-<a href="/en-us/movies/gallery/the-ultimate-star-wars-gift-guide/ss-BBn8AxR"  >
-<img alt="&lt;p>Even the Star Wars universe suffers from zombie outbreaks now and then. This ..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn8If5.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Lucasfilm" /> <div>
-<h4 >The Ultimate Star Wars Gift Guide</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBgcH6l.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Moviefone</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="282" data-m='{"i":282,"p":279,"n":"HeadlineItemViewModel","y":13,"l":"BBn8mEp","h":0,"v":"tv","c":"tv-celebrity","o":3}'  >
-<a href="/en-us/tv/celebrity/bindi-irwin-chandler-powell-breaking-up-over-derek-hough/ar-BBn8mEp?li=AA59yv"  >
-<img alt="(Getty Images)" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn8k5q.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=226&amp;y=130&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="2015 Getty Images" /> <div>
-<h4 >Bindi Irwin, Chandler Powell Breaking Up Over Derek Hough?</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBbyo1E.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Gossip Cop</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="283" data-m='{"i":283,"p":278,"n":"tertiary","y":8,"o":2}'>
- <li  data-id="284" data-m='{"i":284,"p":283,"n":"HeadlineItemViewModel","y":13,"l":"BBmWuoH","h":0,"v":"movies","c":"movies-gallery","o":1}'   class="media photo"   >
-<a href="/en-us/movies/gallery/home-alone-stars-where-are-they-now/ss-BBmWuoH"  >
-<img alt="&lt;p>&lt;strong>Macaulay Culkin, &quot;Kevin McCallister&quot;&lt;/strong>&lt;/p>&lt;p>Culkin first made..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmWunt.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="AUX.TV" /> <div>
-<h4 >Where the stars of &#39;Home Alone&#39; are, 25 years later</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBgcH6l.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Moviefone</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="285" data-m='{"i":285,"p":283,"n":"HeadlineItemViewModel","y":13,"l":"BBn8HwM","h":0,"v":"movies","c":"movies-celebrity","o":2}'  >
-<a href="/en-us/movies/celebrity/exclusive-burt-reynolds-regrets-iconic-1972-nude-centerfold-i-was-very-young-and-very-stupid/ar-BBn8HwM?li=AA59yv"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn8x0p.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=400&amp;y=149&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by CBS Interactive Inc." /> <div>
-<h4 >Burt Reynolds Regrets Nude Centerfold: &#39;I Was Very Young and Very Stupid&#39;</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBm8qVB.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>ETOnline</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="286" data-m='{"i":286,"p":283,"n":"HeadlineItemViewModel","y":13,"l":"BBnaGNC","h":0,"v":"video","c":"music","o":3}'   class="media video"   >
-<a href="/en-us/video/music/adele-admits-she-had-body-insecurities/vi-BBnaGNC"  >
-<img alt="Adele Admits She Had Body Insecurities" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn8Qu0.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=309&amp;y=353&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="AOL" /> <div>
-<h4 >Adele Admits She Had Body Insecurities</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB1PDTo.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Hollyscoop</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="secondary"  data-aop="secondary"  data-id="287" data-m='{"i":287,"p":278,"n":"secondary","y":8,"o":3}'>
- <li  data-id="288" data-m='{"i":288,"p":287,"n":"HeadlineItemViewModel","y":13,"l":"AAf3eY0","h":0,"v":"tv","c":"tv-gallery","o":1}'   class="media photo"   >
-<a href="/en-us/tv/gallery/canceled-renewed-or-ending/ss-AAf3eY0"  >
-<img alt="WICKED CITY - Welcome to Los Angeles, circa 1982, during the rock &#39;n&#39; roll, coca..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBlqS8x.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1328&amp;y=528&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Eric McCandless/ABC" /> <div>
-<h4 >Your favorite TV shows: canceled, renewed or ending?</h4>
-
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- 
-</div>
-    </div>
-
-                <div class="paging"></div>
-            </div>
-                <button class="rightarrow"  data-id="289" data-m='{"i":289,"p":257,"n":"rightarrow","y":12,"o":5}'></button>
-            
-        </div>
-    </div>
-<div class='normalsection'  data-section-id="bannerad3"><div class='full-width'><div class='sectioncontent'  data-region="bannerad3_section">
- <div  id="banner6_homepage_7ba42286-5d45-433b-b3c1-a4f9075ab587"  class="widead"   data-aop="bannerad3.ad_ad"  data-id="290" data-m='{"i":290,"p":19,"n":"BannerAd3.ad","t":"ad","o":10}' >
-<div class="outeradcontainer">
-<div  id="banner6_homepage_container_7ba42286-5d45-433b-b3c1-a4f9075ab587" class="adcontainer" data-adjs='{"allowedViews":"SIZE234COLUMN"}'>
- <script class="sdkdapscript">
-                        require(["dap"], function (dap)
-                        {
- dap("&amp;AP=1390&amp;PG=MSNUSEN12&amp;PVGUID=cc7227b7f7fe4e3bb644226f3ef2c489&amp;PROVIDERID=7HD66FC", 728, 90, "banner6_homepage_container_7ba42286-5d45-433b-b3c1-a4f9075ab587", {"isEnabled":0, "isDarkTheme":0}, {"scrollInit":true,"enableAdRefresh":true,"adaptiveRefresh":true,"adaptiveRefreshInterval":3000,"prid":"7HD66FC","rid":"cc7227b7f7fe4e3bb644226f3ef2c489"});
- });
-</script>
- </div>
-     <a href="http://go.microsoft.com/fwlink/?LinkID=286759" class="adchoices" target="_blank" data-piitxt="adchoices">
-        <span class="adchoiceicon"></span>
-        <span>AdChoices</span>
-    </a>
-
-</div>
-</div>
-</div></div></div>    <div  class="stripecontainer"  data-section-id="stripe.sports"  data-section-id="stripe.sports">
-        <div class="sports stripeouter"  data-aop="stripe.sports_stripe"  data-id="291" data-m='{"i":291,"p":19,"n":"stripe.sports","t":"stripe","o":11}'>
-            
-                <button class="leftarrow"  data-id="292" data-m='{"i":292,"p":291,"n":"leftarrow","y":12,"o":1}'></button>
-            <div class="stripe full-width">
-                
- <div class="stripenav"  data-aop="stripe.sports.navigation_stripenavigation"  data-id="293" data-m='{"i":293,"p":291,"n":"stripe.sports.navigation","t":"stripeNavigation","o":2}'>
- 
-<ul>
- <li  data-id="294" data-m='{"i":294,"p":293,"n":"sports","y":4,"o":1}'><h2><a href="/en-us/sports"  data-id="295" data-m='{"i":295,"p":293,"n":"sports","y":4,"o":2}'>Sports</a></h2></li>
-  <li  class="hide12"  data-id="296" data-m='{"i":296,"p":293,"n":"listlink","y":4,"l":"NFL","o":3}'><a href="/en-us/sports/nfl">NFL</a></li>
- <li  class="hide12"  data-id="297" data-m='{"i":297,"p":293,"n":"listlink","y":4,"l":"MLB","o":4}'><a href="/en-us/sports/mlb">MLB</a></li>
- <li  class="hide12"  data-id="298" data-m='{"i":298,"p":293,"n":"listlink","y":4,"l":"NCAA FB","o":5}'><a href="/en-us/sports/ncaafb">NCAA FB</a></li>
- <li  class="hide12"  data-id="299" data-m='{"i":299,"p":293,"n":"listlink","y":4,"l":"NBA","o":6}'><a href="/en-us/sports/nba">NBA</a></li>
- <li  class="hide12"  data-id="300" data-m='{"i":300,"p":293,"n":"listlink","y":4,"l":"NCAA BK","o":7}'><a href="/en-us/sports/ncaabk">NCAA BK</a></li>
- <li  class="hide123"  data-id="301" data-m='{"i":301,"p":293,"n":"listlink","y":4,"l":"NHL","o":8}'><a href="/en-us/sports/nhl">NHL</a></li>
- <li  class="hide123"  data-id="302" data-m='{"i":302,"p":293,"n":"listlink","y":4,"l":"GOLF","o":9}'><a href="/en-us/sports/golf">GOLF</a></li>
- <li  class="hide123"  data-id="303" data-m='{"i":303,"p":293,"n":"listlink","y":4,"l":"NASCAR/MOTORS","o":10}'><a href="/en-us/sports/motorsports">NASCAR/MOTORS</a></li>
- <li  class="hide123"  data-id="304" data-m='{"i":304,"p":293,"n":"listlink","y":4,"l":"SOCCER","o":11}'><a href="/en-us/sports/soccer">SOCCER</a></li>
- <li  class="hide123"  data-id="305" data-m='{"i":305,"p":293,"n":"listlink","y":4,"l":"TENNIS","o":12}'><a href="/en-us/sports/tennis">TENNIS</a></li>
- <li  class="hide123"  data-id="306" data-m='{"i":306,"p":293,"n":"listlink","y":4,"l":"MMA/UFC","o":13}'><a href="/en-us/sports/mma-ufc">MMA/UFC</a></li>
- <li  class="hide123"  data-id="307" data-m='{"i":307,"p":293,"n":"listlink","y":4,"l":"FANTASY","o":14}'><a href="/en-us/sports/fantasy">FANTASY</a></li>
- </ul>
- <div class="stripemenu">
-<button class="edit"  data-id="308" data-m='{"i":308,"p":293,"n":"personalization","t":"dropdown","o":15}'>Edit</button>
- <button  data-id="309" data-m='{"i":309,"p":293,"n":"remove","t":"dropdownitem","o":16}' class="remove">Remove Section</button>
- <button  data-id="310" data-m='{"i":310,"p":293,"n":"moveup","t":"dropdownitem","o":17}' class="up">Move Section Up</button>
-<button  data-id="311" data-m='{"i":311,"p":293,"n":"movedown","t":"dropdownitem","o":18}' class="down">Move Section Down</button>
- <button  data-id="312" data-m='{"i":312,"p":293,"n":"addbelow","t":"dropdownitem","o":19}' class="add">Add Section Below</button>
- </div>
- 
-</div>
-    <div class="paging-container">
-
- <div  class="stripecontent normaldensity"  data-module-id="startpage|stripe.sports|stripe|stripe.sports.hero|headlines"  data-aop="hero"  data-id="313" data-m='{"i":313,"p":291,"n":"stripe.sports.hero","t":"headlines","o":3}'>
- 
- <ul class="secondary"  data-aop="secondary"  data-id="314" data-m='{"i":314,"p":313,"n":"secondary","y":8,"o":1}'>
- <li  data-id="315" data-m='{"i":315,"p":314,"n":"HeadlineItemViewModel","y":13,"l":"BBnawo7","h":0,"v":"sports","c":"more_sports","o":1}'   class="media photo"   >
-<a href="/en-us/sports/more-sports/wacky-sports-photos-of-the-week-nov-11-17/ss-BBnawo7"  >
-<img alt="Zooperstar entertainer Mackarel Jordan spits out another entertainer who had pos..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnaATx.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=444&amp;y=415&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Sports Illustrated" /> <div>
-<h4 >Sports Illustrated&#39;s wacky photos of the week</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAfDKO5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Sports Illustrated</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- 
-</div>
-
- <div  class="stripecontent normaldensity"  data-module-id="startpage|stripe.sports|stripe|stripe.sports.topStories|headlines"  data-aop="top stories"  data-id="316" data-m='{"i":316,"p":291,"n":"stripe.sports.topStories","t":"headlines","o":4}'>
- 
- <ul class="tertiary"  data-aop="tertiary"  data-id="317" data-m='{"i":317,"p":316,"n":"tertiary","y":8,"o":1}'>
- <li  data-id="318" data-m='{"i":318,"p":317,"n":"HeadlineItemViewModel","y":13,"l":"BBn6ZQj","h":0,"v":"sports","c":"football_nfl","o":1}'   class="media photo"   >
-<a href="/en-us/sports/nfl/not-just-peyton-manning-nfl-players-who-overstayed-their-welcome/ss-BBn6ZQj"  >
-<img alt="How we want to remember him: An amazing rookie season with Minnesota in 1998 was..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn6VoO.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Getty Images" /> <div>
-<h4 >Not just Peyton: NFL players who overstayed their welcome</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA2vq8h.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>FOXSports</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="319" data-m='{"i":319,"p":317,"n":"HeadlineItemViewModel","y":13,"l":"BBnah8U","h":0,"v":"sports","c":"baseball_mlb","o":2}'  >
-<a href="/en-us/sports/mlb/the-eight-best-pitchers-who-didnt-win-a-cy-young-award/ar-BBnah8U?li=AA54yf"  >
-<img alt="Nolan Ryan of the Houston Astros  pitches against the Montreal Expos on April 27..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAcpakx.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1748&amp;y=831&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Manny Millan /Sports Illustrated/Getty Images" /> <div>
-<h4 >8 best pitchers who didn&#39;t win a Cy Young award</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBaLHYp.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Sporting News</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="320" data-m='{"i":320,"p":317,"n":"HeadlineItemViewModel","y":13,"l":"BBnanBF","h":0,"v":"sports","c":"football_ncaa","o":3}'  >
-<a href="/en-us/sports/ncaafb/alabama-has-a-case-for-being-the-top-seed-in-the-college-football-playoff/ar-BBnanBF?li=AA54yf"  >
-<img alt="Matt Bush-USA TODAY Sports" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnawRr.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1434&amp;y=412&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by USA Today Sports" /> <div>
-<h4 >Alabama has a case for being the Playoff&#39;s top seed</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB4kwB1.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>USA Today Sports</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="321" data-m='{"i":321,"p":316,"n":"tertiary","y":8,"o":2}'>
- <li  data-id="322" data-m='{"i":322,"p":321,"n":"HeadlineItemViewModel","y":13,"l":"BBn8QVy","h":0,"v":"sports","c":"more_sports","o":1}'   class="media video"   >
-<a href="/en-us/sports/more-sports/tiny-bruin-celebrates-goal/vi-BBn8QVy"  >
-<img alt="Donkey basketball" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9fO1.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="120 sports" /> <div>
-<h4 >The return of donkey basketball and more crazy videos</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB6qRzt.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>120 Sports</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="323" data-m='{"i":323,"p":321,"n":"HeadlineItemViewModel","y":13,"l":"BBnaxpG","h":0,"v":"sports","c":"soccer_epl","o":2}'  >
-<a href="/en-us/sports/premier-league/french-soccer-player-reveals-he-owns-a-revolutionary-energy-company-that-could-be-worth-billions/ar-BBnaxpG?li=AA54yf"  >
-<img alt="Arsenal&#39;s French midfielder Mathieu Flamini (R) celebrates after scoring their s..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAeGWUr.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=652&amp;y=117&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="AFP/Getty Images" /> <div>
-<h4 >Soccer player owns a company that could be worth billions</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB4kwB1.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>USA Today Sports</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="324" data-m='{"i":324,"p":321,"n":"HeadlineItemViewModel","y":13,"l":"BBn7KCF","h":0,"v":"sports","c":"basketball_nba","o":3}'   class="media photo"   >
-<a href="/en-us/sports/nba/nba-power-rankings/ss-BBn7KCF"  >
-<img alt="There isn&#39;t much more we can say about this team. Heading into Monday night, the..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn7KCC.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Ezra Shaw/Getty Images" /> <div>
-<h4 >NBA power rankings: Warriors remain perfect</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3ldrf.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Yardbarker</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="secondary"  data-aop="secondary"  data-id="325" data-m='{"i":325,"p":316,"n":"secondary","y":8,"o":3}'>
- <li  data-id="326" data-m='{"i":326,"p":325,"n":"HeadlineItemViewModel","y":13,"l":"BBnab1G","h":0,"v":"sports","c":"racing","o":1}'  >
-<a href="/en-us/sports/motorsports/chase-for-the-sprint-cup-breaking-down-four-championship-contenders/ar-BBnab1G?li=AA54yf"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBna4n5.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=954&amp;y=131&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Sporting News" /> <div>
-<h4 >Chase for the Sprint Cup: Breaking down the contenders</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBaLHYp.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Sporting News</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="327" data-m='{"i":327,"p":316,"n":"tertiary","y":8,"o":4}'>
- <li  data-id="328" data-m='{"i":328,"p":327,"n":"HeadlineItemViewModel","y":13,"l":"BBn9xDm","h":0,"v":"sports","c":"football_nfl","o":1}'  >
-<a href="/en-us/sports/nfl/as-green-bays-offense-sputters-its-dragging-the-packers-down-with-it/ar-BBn9xDm?li=AA54yf"  >
-<img alt="Green Bay Packers quarterback Aaron Rodgers (12) leaves the field following a sa..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9WbJ.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1163&amp;y=551&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Mandatory Credit: Ron Chenoy-USA TODAY Sports" /> <div>
-<h4 >As Green Bay&#39;s offense sputters, it&#39;s dragging the Packers down with it</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAfDKO5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Sports Illustrated</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="329" data-m='{"i":329,"p":327,"n":"HeadlineItemViewModel","y":13,"l":"BBn95ZK","h":0,"v":"sports","c":"football_ncaa","o":2}'  >
-<a href="/en-us/sports/ncaafb/tailgate-the-best-losses-by-one-loss-teams/ar-BBn95ZK?li=AA54yf"  >
-<img alt="Patrick Semansky, AP" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9at2.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=870&amp;y=440&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Patrick Semansky, AP" /> <div>
-<h4 >The best losses by one-loss teams in college football</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB4kwB1.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>USA Today Sports</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="330" data-m='{"i":330,"p":327,"n":"HeadlineItemViewModel","y":13,"l":"BBn9M0N","h":0,"v":"sports","c":"basketball_ncaa","o":3}'  >
-<a href="/en-us/sports/ncaabk/what-we-learned-from-kentucky-and-michigan-state%e2%80%99s-wins-in-chicago/ar-BBn9M0N?li=AA54yf"  >
-<img alt="Kentucky Wildcats guard Jamal Murray (23) moves past Duke Blue Devils guard Matt..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9N2f.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1128&amp;y=465&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Mandatory Credit: Dennis Wierzbicki-USA TODAY Sports" /> <div>
-<h4 >What we learned from Kentucky, Michigan State?s wins</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAfDKO5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Sports Illustrated</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="331" data-m='{"i":331,"p":316,"n":"tertiary","y":8,"o":5}'>
- <li  data-id="332" data-m='{"i":332,"p":331,"n":"HeadlineItemViewModel","y":13,"l":"BBna2aR","h":0,"v":"sports","c":"racing","o":1}'  >
-<a href="/en-us/sports/motorsports/kevin-harvick-justin-bieber-win-tonight-show-must-see-go-kart-race/ar-BBna2aR?li=AA54yf"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBna015.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=954&amp;y=380&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Sporting News" /> <div>
-<h4 >Must-see: Harvick, Bieber win Tonight Show go-kart race</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBaLHYp.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Sporting News</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="333" data-m='{"i":333,"p":331,"n":"HeadlineItemViewModel","y":13,"l":"BBn9KD8","h":0,"v":"sports","c":"football_nfl","o":2}'  >
-<a href="/en-us/sports/nfl/tom-brady-named-gq-man-of-the-year/ar-BBn9KD8?li=AA54yf"  >
-<img alt="Patriots quarterback Tom Brady has been named GQ&#39;s Man of the Year." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9KD3.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=807&amp;y=407&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="GQ" /> <div>
-<h4 >Brady named one of GQ&#39;s &#39;Men of the Year&#39;</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB1FUYS.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>NESN</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="334" data-m='{"i":334,"p":331,"n":"HeadlineItemViewModel","y":13,"l":"BBn8Tqv","h":0,"v":"sports","c":"icehockey_nhl_videos","o":3}'   class="media video"   >
-<a href="/en-us/sports/nhlvideos/bieksa-loses-tooth-in-scrap/vi-BBn8Tqv"  >
-<img alt="Bieksa Loses Tooth in Scrap" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn8OHo.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=619&amp;y=240&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="120 Sports" /> <div>
-<h4 >NHL player loses tooth in nasty fight</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB6qRzt.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>120 Sports</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="secondary"  data-aop="secondary"  data-id="335" data-m='{"i":335,"p":316,"n":"secondary","y":8,"o":6}'>
- <li  data-id="336" data-m='{"i":336,"p":335,"n":"HeadlineItemViewModel","y":13,"l":"AAdW4Ep","h":0,"v":"sports","c":"football_ncaa","o":1}'   class="media photo"   >
-<a href="/en-us/sports/ncaafb/college-cheerleaders/ss-AAdW4Ep"  >
-<img alt="The Golden Girls Dance Team of the Florida State Seminoles performs during a gam..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9kRX.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1112&amp;y=740&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Bill Feig/AP" /> <div>
-<h4 >College cheerleaders</h4>
-
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="secondary"  data-aop="secondary"  data-id="337" data-m='{"i":337,"p":316,"n":"secondary","y":8,"o":7}'>
- <li  data-id="338" data-m='{"i":338,"p":337,"n":"HeadlineItemViewModel","y":13,"l":"BBn8w3V","h":0,"v":"sports","c":"more_sports","o":1}'   class="media photo"   >
-<a href="/en-us/sports/more-sports/the-day-in-sports-photos/ss-BBn8w3V"  >
-<img alt="Nov 17, 2015; Chicago, IL, USA; The Kansas Jayhawks and Michigan State Spartans ..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9dLo.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Dennis Wierzbicki/USA TODAY Sports" /> <div>
-<h4 >Mascots spar and more top photos</h4>
-
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- 
-</div>
-    </div>
-
-                <div class="paging"></div>
-            </div>
-                <button class="rightarrow"  data-id="339" data-m='{"i":339,"p":291,"n":"rightarrow","y":12,"o":5}'></button>
-            
-        </div>
-    </div>
-    <div  class="stripecontainer"  data-nativead="40_money_.stripecontent .tertiary li:nth-child(2)" data-section-id="stripe.finance"  data-section-id="stripe.finance">
-        <div class="finance stripeouter"  data-aop="stripe.finance_stripe"  data-id="340" data-m='{"i":340,"p":19,"n":"stripe.finance","t":"stripe","o":12}'>
-            
-                <button class="leftarrow"  data-id="341" data-m='{"i":341,"p":340,"n":"leftarrow","y":12,"o":1}'></button>
-            <div class="stripe full-width">
-                
- <div class="stripenav"  data-aop="stripe.finance.navigation_stripenavigation"  data-id="342" data-m='{"i":342,"p":340,"n":"stripe.finance.navigation","t":"stripeNavigation","o":2}'>
- 
-<ul>
- <li  data-id="343" data-m='{"i":343,"p":342,"n":"finance","y":4,"o":1}'><h2><a href="/en-us/money"  data-id="344" data-m='{"i":344,"p":342,"n":"finance","y":4,"o":2}'>Money</a></h2></li>
-  <li  class="hide12"  data-id="345" data-m='{"i":345,"p":342,"n":"Portfolio","y":4,"o":3}'><a href="/en-us/money/watchlist">MY WATCHLIST</a></li>
- <li  class="hide12"  data-id="346" data-m='{"i":346,"p":342,"n":"Markets","y":4,"o":4}'><a href="/en-us/money/markets">MARKETS</a></li>
- <li  class="hide12"  data-id="347" data-m='{"i":347,"p":342,"n":"finance-investing","y":4,"o":5}'><a href="/en-us/money/investing">INVESTING</a></li>
- <li  class="hide12"  data-id="348" data-m='{"i":348,"p":342,"n":"PersonalFinance","y":4,"o":6}'><a href="/en-us/money/personalfinance">PERSONAL FINANCE</a></li>
- <li  class="hide12"  data-id="349" data-m='{"i":349,"p":342,"n":"finance-real-estate","y":4,"o":7}'><a href="/en-us/money/realestate">REAL ESTATE</a></li>
- <li  class="hide123"  data-id="350" data-m='{"i":350,"p":342,"n":"finance-careers","y":4,"o":8}'><a href="/en-us/money/careers">CAREERS</a></li>
- <li  class="hide123"  data-id="351" data-m='{"i":351,"p":342,"n":"Videos","y":4,"o":9}'><a href="/en-us/money/videos">VIDEOS</a></li>
- <li  class="hide123"  data-id="352" data-m='{"i":352,"p":342,"n":"stockscreener","y":4,"o":10}'><a href="/en-us/money/stockscreener">STOCK SCREENER</a></li>
- <li  class="hide123"  data-id="353" data-m='{"i":353,"p":342,"n":"brokercenter","y":4,"o":11}'><a href="/en-us/money/brokercenter">BROKER CENTER</a></li>
- </ul>
- <div class="stripemenu">
-<button class="edit"  data-id="354" data-m='{"i":354,"p":342,"n":"personalization","t":"dropdown","o":12}'>Edit</button>
- <button  data-id="355" data-m='{"i":355,"p":342,"n":"remove","t":"dropdownitem","o":13}' class="remove">Remove Section</button>
- <button  data-id="356" data-m='{"i":356,"p":342,"n":"moveup","t":"dropdownitem","o":14}' class="up">Move Section Up</button>
-<button  data-id="357" data-m='{"i":357,"p":342,"n":"movedown","t":"dropdownitem","o":15}' class="down">Move Section Down</button>
- <button  data-id="358" data-m='{"i":358,"p":342,"n":"addbelow","t":"dropdownitem","o":16}' class="add">Add Section Below</button>
- </div>
- 
-</div>
-    <div class="paging-container">
-
-
-
-<script>
-    define("homepageFinanceIndices", ["c.deferred"], function () {
-        var config = {};
-        config.indexdetailsurl = "/en-us/money/indexdetails";
-config.stockdetailsurl = "/en-us/money/stockdetails";
-config.funddetailsurl = "/en-us/money/funddetails";
-config.etfdetailsurl = "/en-us/money/etfdetails";
-config.recentquotesurl = "/en-us/money/getrecentquotes";
-config.commoditydetailsurl = "/en-us/money/markets/commoditydetails";
-config.currencyConverterUrl = "/en-us/money/currencyconverter";
-config.market = "en-us";
-config.FORMCode = "PRHPSQ";
-config.PopularSearchesFormCode = "PHMSPS";
-config.RecentQuotesFormCode = "PRHMRQ";
-return config;
-});
-</script>
- <div id="fi-module1" class="dense-module"   data-id="359" data-m='{"i":359,"p":340,"n":"stripe.finance.denseSD","t":"FinanceHomepageStructuredDataModuleServiceTask","o":3}'>
-<div class="fi-as-container">
-<input type="text" id="finance-autosuggest" placeholder="Quote Search" title="Quote Search" autocorrect="off" autocomplete="off"  data-id="360" data-m='{"i":360,"p":340,"n":"quotesearch","y":14,"o":4}' />
-<span class="search fi-as-icon"></span>
-</div>
- <div class="as-peek-container">
-
- <div class="as-peek">
-<span class="fin-rcnt-qts-hdr">Trending</span>
-<span>: </span>
- <a href="/en-us/money/stockdetails/fi-126.1.TGT.NYS?form=PHMSPS" class="peek-links"  data-id="361" data-m='{"i":361,"p":340,"n":"DenseStartStripePeekViewLinks","y":14,"o":5}'>
- TGT
-</a>
- <span>, </span>
- <a href="/en-us/money/stockdetails/fi-126.1.HD.NYS?form=PHMSPS" class="peek-links"  data-id="362" data-m='{"i":362,"p":340,"n":"DenseStartStripePeekViewLinks","y":14,"o":6}'>
- HD
-</a>
- <span>, </span>
- <a href="/en-us/money/stockdetails/fi-126.1.LOW.NYS?form=PHMSPS" class="peek-links"  data-id="363" data-m='{"i":363,"p":340,"n":"DenseStartStripePeekViewLinks","y":14,"o":7}'>
- LOW
-</a>
- <span>, </span>
- <a href="/en-us/money/stockdetails/fi-126.1.AAPL.NAS?form=PHMSPS" class="peek-links"  data-id="364" data-m='{"i":364,"p":340,"n":"DenseStartStripePeekViewLinks","y":14,"o":8}'>
- AAPL
-</a>
- <span>, </span>
- <a href="/en-us/money/stockdetails/fi-126.1.DGLY.NAS?form=PHMSPS" class="peek-links"  data-id="365" data-m='{"i":365,"p":340,"n":"DenseStartStripePeekViewLinks","y":14,"o":9}'>
- DGLY
-</a>
- </div>
-
-</div>
-
- <a class="multiquoteboxheader markets-header" href="/en-us/money/markets"  data-id="366" data-m='{"i":366,"p":340,"n":"DenseStartStripeMarketsLink","y":14,"o":10}'>
-<span>Market</span>
-<span class="multiquote-cheveron"></span>
-</a>
- <a href="/en-us/money/indexdetails/fi-30.10.%21DJI.30.%24INDU"  data-id="367" data-m='{"i":367,"p":340,"n":"DenseStartStripeEntitiesLink","y":14,"o":11}'>
- <div class="fi-multiquoteview">
- <span class="fi-title"><p class='truncated-string' tabindex = '0' title='DOW'>DOW</p></span>
- <span class="fi-sec-title"><p class='truncated-string' tabindex = '0' title='$INDU'>$INDU</p></span>
- <div class="fi-values">
-<div class="fi-curval-cntr">
-<span class="fi-curval">17,691.03</span>
-<span class="fi-chdir increase">&#x25B2;</span>
-</div>
-<div class="fi-ch-cntnr">
-<span class="fi-ch  increase">+201.53</span>
-<span class="fi-chp  increase">+1.15%</span>
-</div>
-</div>
- </div>
- <div class="fi-multiquoteview-hover"></div>
-
-</a>
- <a href="/en-us/money/indexdetails/fi-33.10.SPX"  data-id="368" data-m='{"i":368,"p":340,"n":"DenseStartStripeEntitiesLink","y":14,"o":12}'>
- <div class="fi-multiquoteview">
- <span class="fi-title"><p class='truncated-string' tabindex = '0' title='S&amp;P 500'>S&amp;P 500</p></span>
- <span class="fi-sec-title"><p class='truncated-string' tabindex = '0' title='SPX'>SPX</p></span>
- <div class="fi-values">
-<div class="fi-curval-cntr">
-<span class="fi-curval">2,075.96</span>
-<span class="fi-chdir increase">&#x25B2;</span>
-</div>
-<div class="fi-ch-cntnr">
-<span class="fi-ch  increase">+25.52</span>
-<span class="fi-chp  increase">+1.24%</span>
-</div>
-</div>
- </div>
- <div class="fi-multiquoteview-hover"></div>
-
-</a>
- <a href="/en-us/money/tools/currencyconverter/fi-EUR-USD"  data-id="369" data-m='{"i":369,"p":340,"n":"DenseStartStripeEntitiesLink","y":14,"o":13}'>
- <div class="fi-multiquoteview">
- <span class="fi-title"><p class='truncated-string' tabindex = '0' title='EUR/USD'>EUR/USD</p></span>
- <span class="fi-sec-title"></span>
- <div class="fi-values">
-<div class="fi-curval-cntr">
-<span class="fi-curval">1.0662</span>
-<span class="fi-chdir increase">&#x25B2;</span>
-</div>
-<div class="fi-ch-cntnr">
-<span class="fi-ch  increase">+0.0019</span>
-<span class="fi-chp  increase">+0.18%</span>
-</div>
-</div>
- </div>
- <div class="fi-multiquoteview-hover"></div>
-
-</a>
- <a href="/en-us/money/markets/commoditydetails/fi-67.3.%40CL0Y"  data-id="370" data-m='{"i":370,"p":340,"n":"DenseStartStripeEntitiesLink","y":14,"o":14}'>
- <div class="fi-multiquoteview">
- <span class="fi-title"><p class='truncated-string' tabindex = '0' title='Crude Oil'>Crude Oil</p></span>
- <span class="fi-sec-title"></span>
- <div class="fi-values">
-<div class="fi-curval-cntr">
-<span class="fi-curval">42.19</span>
-<span class="fi-chdir increase">&#x25B2;</span>
-</div>
-<div class="fi-ch-cntnr">
-<span class="fi-ch  increase">+0.48</span>
-<span class="fi-chp  increase">+1.15%</span>
-</div>
-</div>
- </div>
- <div class="fi-multiquoteview-hover"></div>
-
-</a>
-
-</div>
-
-
-
- <div id="fi-watchlist"  data-module-id="startpage|stripe.finance|stripe|financesd2module|FinanceHomepageSD2ModuleServiceTask" data-pdp-dependent="true" class="i0"  data-aop="financesd2module"  data-id="371" data-m='{"i":371,"p":340,"n":"financesd2module","t":"FinanceHomepageSD2ModuleServiceTask","o":15}'>
- </div>
-
- <div  class="stripecontent normaldensity"  data-module-id="startpage|stripe.finance|stripe|stripe.finance.topStories|headlines"  data-aop="top stories"  data-id="372" data-m='{"i":372,"p":340,"n":"stripe.finance.topStories","t":"headlines","o":16}'>
- 
- <ul class="tertiary"  data-aop="tertiary"  data-id="373" data-m='{"i":373,"p":372,"n":"tertiary","y":8,"o":1}'>
- <li  data-id="374" data-m='{"i":374,"p":373,"n":"HeadlineItemViewModel","y":13,"l":"BBnanq8","h":0,"v":"finance","c":"markets","o":1}'  >
-<a href="/en-us/money/markets/fed-leans-toward-december-hike-despite-long-term-concerns/ar-BBnanq8?li=AA4Zjn"  >
-<img alt="Pedestrians walk past the Federal Reserve Bank of New York in New York." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA5ifcR.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1134&amp;y=545&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Seth Wenig/AP Photo?" /> <div>
-<h4 >Fed leans toward December hike despite long-term concerns</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3e1oO.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Reuters</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="375" data-m='{"i":375,"p":373,"n":"HeadlineItemViewModel","y":13,"l":"BBna1Bz","h":0,"v":"finance","c":"finance-companies","o":2}'  >
-<a href="/en-us/money/companies/can-a-dollar100-million-investment-stop-the-bleeding-at-solarcity/ar-BBna1Bz?li=AA4Zjn"  >
-<img alt="Solar rooftop" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBna1Bx.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1046&amp;y=839&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Thinkstock" /> <div>
-<h4 >Can a $100 million investment stop the bleeding at SolarCity?</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3dLwz.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>24/7 Wall St.</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="376" data-m='{"i":376,"p":373,"n":"HeadlineItemViewModel","y":13,"l":"BBn9bVe","h":0,"v":"finance","c":"finance-companies","o":3}'  >
-<a href="/en-us/money/companies/how-amazons-long-game-yielded-a-retail-juggernaut/ar-BBn9bVe?li=AA4Zjn"  >
-<img alt="Parcel delivery in Battery Park City in New York. One analyst predicts that in f..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9eqf.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=829&amp;y=870&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="?ngel Franco/The New York Times" /> <div>
-<h4 >How Amazon&#39;s long game yielded a retail juggernaut</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3l3r5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>The New York Times</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- 
-</div>
-
- <div  class="stripecontent normaldensity"  data-module-id="startpage|stripe.finance|stripe|stripe.finance.topStories2|headlines"  data-aop="top stories2"  data-id="377" data-m='{"i":377,"p":340,"n":"stripe.finance.topStories2","t":"headlines","o":17}'>
- 
- <ul class="secondary"  data-aop="secondary"  data-id="378" data-m='{"i":378,"p":377,"n":"secondary","y":8,"o":1}'>
- <li  data-id="379" data-m='{"i":379,"p":378,"n":"HeadlineItemViewModel","y":13,"l":"BBna15i","h":0,"v":"finance","c":"finance-saving-investing","o":1}'  >
-<a href="/en-us/money/savingandinvesting/why-2-percent-is-the-new-4-percent-for-investors/ar-BBna15i?li=AA4Zjn"  >
-<img alt="Evaluating a financial portfolio." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBiCHmt.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1551&amp;y=907&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="John Lamb/Getty Images" /> <div>
-<h4 >Why 2 percent is the new 4 percent for investors</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB8mVM9.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>U.S. News &amp; World Report</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="380" data-m='{"i":380,"p":377,"n":"tertiary","y":8,"o":2}'>
- <li  data-id="381" data-m='{"i":381,"p":380,"n":"HeadlineItemViewModel","y":13,"l":"BBn9I79","h":0,"v":"finance","c":"markets","o":1}'  >
-<a href="/en-us/money/markets/stocks-rally-as-fed-indicates-december-rate-hike-is-in-play/ar-BBn9I79?li=AA4Zjn"  >
-<img alt="Traders work on the floor of the New York Stock Exchange (NYSE) on August 13, 20..." data-src="{&quot;default&quot;:&quot;//img.s-msn.com/tenant/amp/entityid/BB12OxE.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=930&amp;y=618&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Spencer Platt/Getty Images" /> <div>
-<h4 >Stocks rally as Fed indicates December rate hike is in play</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3lldo.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Bloomberg</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="382" data-m='{"i":382,"p":380,"n":"HeadlineItemViewModel","y":13,"l":"BBnaDHj","h":0,"v":"finance","c":"personalfinance","o":2}'  >
-<a href="/en-us/money/personalfinance/the-surprising-truth-behind-those-black-friday-deals/ar-BBnaDHj?li=AA4Zjn"  >
-<img alt="Shoppers take advantage of sales on 5th Avenue November 29, 2013, during the Bla..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBcfKQr.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1103&amp;y=965&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Timothy Clary/AFP/Getty Images" /> <div>
-<h4 >The surprising truth behind those Black Friday &#39;deals&#39;</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3ltd9.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Fiscal Times</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="383" data-m='{"i":383,"p":380,"n":"NativeAdHeadlineItemViewModel","y":13,"o":3}'  >
-<a href="http://clk.tradedoubler.com/click?p=261853&amp;a=2529304&amp;g=0&amp;epi=Prime_ENUS_HP_MoneyS&amp;url=http://www.microsoftstore.com/store/msusa/en_US/list/Surface-deals/categoryID.67871500?Icid=SalePage_SurfaceEvergreen_ModF_150521&amp;sortby=ranking%20ascending&amp;filters="   target="_blank"     class="nativead"  data-pg="x" data-pid="7HD66FC"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9HWa.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <div>
-<h4 >Get deals on Surface (like $100 off Surface Pro 3)</h4>
-
- <span  class="nativead">Sponsored</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- 
-</div>
-    </div>
-
-                <div class="paging"></div>
-            </div>
-                <button class="rightarrow"  data-id="384" data-m='{"i":384,"p":340,"n":"rightarrow","y":12,"o":18}'></button>
-            
-        </div>
-    </div>
-    <div  class="stripecontainer"  data-nativead="40_lifestyle_.stripecontent .tertiary li:nth-child(3)" data-section-id="stripe.lifestyle"  data-section-id="stripe.lifestyle">
-        <div class="lifestyle stripeouter"  data-aop="stripe.lifestyle_stripe"  data-id="385" data-m='{"i":385,"p":19,"n":"stripe.lifestyle","t":"stripe","o":13}'>
-            
-                <button class="leftarrow"  data-id="386" data-m='{"i":386,"p":385,"n":"leftarrow","y":12,"o":1}'></button>
-            <div class="stripe full-width">
-                
- <div class="stripenav"  data-aop="stripe.lifestyle.navigation_stripenavigation"  data-id="387" data-m='{"i":387,"p":385,"n":"stripe.lifestyle.navigation","t":"stripeNavigation","o":2}'>
- 
-<ul>
- <li  data-id="388" data-m='{"i":388,"p":387,"n":"lifestyle","y":4,"o":1}'><h2><a href="/en-us/lifestyle"  data-id="389" data-m='{"i":389,"p":387,"n":"lifestyle","y":4,"o":2}'>Lifestyle</a></h2></li>
-  <li  class="hide12"  data-id="390" data-m='{"i":390,"p":387,"n":"listlink","y":4,"l":"STYLE","o":3}'><a href="/en-us/lifestyle/style">STYLE</a></li>
- <li  class="hide12"  data-id="391" data-m='{"i":391,"p":387,"n":"listlink","y":4,"l":"HOME \u0026 GARDEN","o":4}'><a href="/en-us/lifestyle/home-and-garden">HOME &amp; GARDEN</a></li>
- <li  class="hide12"  data-id="392" data-m='{"i":392,"p":387,"n":"listlink","y":4,"l":"FAMILY","o":5}'><a href="/en-us/lifestyle/family">FAMILY</a></li>
- <li  class="hide12"  data-id="393" data-m='{"i":393,"p":387,"n":"listlink","y":4,"l":"SMART LIVING","o":6}'><a href="/en-us/lifestyle/smart-living">SMART LIVING</a></li>
- <li  class="hide12"  data-id="394" data-m='{"i":394,"p":387,"n":"listlink","y":4,"l":"RELATIONSHIPS","o":7}'><a href="/en-us/lifestyle/relationships">RELATIONSHIPS</a></li>
- <li  class="hide123"  data-id="395" data-m='{"i":395,"p":387,"n":"listlink","y":4,"l":"HOROSCOPES","o":8}'><a href="/en-us/lifestyle/horoscope">HOROSCOPES</a></li>
- <li  class="hide123"  data-id="396" data-m='{"i":396,"p":387,"n":"listlink","y":4,"l":"SHOPPING","o":9}'><a href="/en-us/lifestyle/shopping">SHOPPING</a></li>
- <li  class="hide123"  data-id="397" data-m='{"i":397,"p":387,"n":"listlink","y":4,"l":"MEET SINGLES","o":10}'><a href="http://www.match.com/cpx/en-us/partner/msn/index?trackingid=530290&amp;bannerid=3414601">MEET SINGLES</a></li>
- <li  class="hide123"  data-id="398" data-m='{"i":398,"p":387,"n":"listlink","y":4,"l":"VIDEO","o":11}'><a href="/en-us/lifestyle/video">VIDEO</a></li>
- </ul>
- <div class="stripemenu">
-<button class="edit"  data-id="399" data-m='{"i":399,"p":387,"n":"personalization","t":"dropdown","o":12}'>Edit</button>
- <button  data-id="400" data-m='{"i":400,"p":387,"n":"remove","t":"dropdownitem","o":13}' class="remove">Remove Section</button>
- <button  data-id="401" data-m='{"i":401,"p":387,"n":"moveup","t":"dropdownitem","o":14}' class="up">Move Section Up</button>
-<button  data-id="402" data-m='{"i":402,"p":387,"n":"movedown","t":"dropdownitem","o":15}' class="down">Move Section Down</button>
- <button  data-id="403" data-m='{"i":403,"p":387,"n":"addbelow","t":"dropdownitem","o":16}' class="add">Add Section Below</button>
- </div>
- 
-</div>
-    <div class="paging-container">
-
- <div  class="stripecontent normaldensity"  data-module-id="startpage|stripe.lifestyle|stripe|stripe.lifestyle.topstories|headlines"  data-aop="top stories"  data-id="404" data-m='{"i":404,"p":385,"n":"stripe.lifestyle.topstories","t":"headlines","o":3}'>
- 
- <ul class="secondary"  data-aop="secondary"  data-id="405" data-m='{"i":405,"p":404,"n":"secondary","y":8,"o":1}'>
- <li  data-id="406" data-m='{"i":406,"p":405,"n":"HeadlineItemViewModel","y":13,"l":"BBn6p2J","h":0,"v":"lifestyle","c":"lifestylefashion","o":1}'   class="media photo"   >
-<a href="/en-us/lifestyle/fashion/10-life-changing-bra-hacks-every-girl-should-know/ss-BBn6p2J"  >
-<img alt="A paperclip works too, in a pinch." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn6kUt.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=997&amp;y=493&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Seventeen" /> <div>
-<h4 >10 Life-Changing Bra Hacks Every Girl Should Know</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA9znQg.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Seventeen</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="407" data-m='{"i":407,"p":404,"n":"tertiary","y":8,"o":2}'>
- <li  data-id="408" data-m='{"i":408,"p":407,"n":"HeadlineItemViewModel","y":13,"l":"BBmX7Xc","h":0,"v":"lifestyle","c":"lifestylehoroscope","o":1}'   class="media photo"   >
-<a href="/en-us/lifestyle/horoscope/are-you-a-typical-scorpio-the-proof-is-in-your-closet/ss-BBmX7Xc"  >
-<img alt="Woman in front of closet." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmX0p1.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1668&amp;y=500&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Squaredpixels/E+/Getty Images" /> <div>
-<h4 >Are You a Typical Scorpio? The Proof Is in Your Closet</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA6org5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Glamour</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="409" data-m='{"i":409,"p":407,"n":"HeadlineItemViewModel","y":13,"l":"BBmNK8R","h":0,"v":"lifestyle","c":"lifestylepets","o":2}'   class="media photo"   >
-<a href="/en-us/lifestyle/pets/10-of-the-cutest-puppy-eyes/ss-BBmNK8R"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmQI82.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=481&amp;y=410&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <div>
-<h4 >10 of the Cutest Puppy Eyes</h4>
-
- <span>Pets on Mom.me</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="410" data-m='{"i":410,"p":407,"n":"HeadlineItemViewModel","y":13,"l":"BBn9Ffv","h":0,"v":"lifestyle","c":"lifestylemindandsoul","o":3}'   class="media photo"   >
-<a href="/en-us/lifestyle/mind-and-soul/haunting-photos-show-where-refugee-children-are-forced-to-sleep/ss-BBn9Ffv"  >
-<img alt="Imagine waking up in the morning without knowing where you will lay your head th..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9Vao.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=702&amp;y=1192&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Refinery29" /> <div>
-<h4 >Haunting Photos Show Where Refugee Children Are Forced To Sleep</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA6u4ZP.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Refinery29</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="411" data-m='{"i":411,"p":404,"n":"tertiary","y":8,"o":3}'>
- <li  data-id="412" data-m='{"i":412,"p":411,"n":"HeadlineItemViewModel","y":13,"l":"BBmSKvX","h":0,"v":"lifestyle","c":"lifestylesmartliving","o":1}'   class="media photo"   >
-<a href="/en-us/lifestyle/smart-living/these-heartbreaking-photos-capture-how-hard-it-is-to-be-15-around-the-world/ss-BBmSKvX"  >
-<img alt="Anyone who&#39;s been 15 knows it&#39;s not an easy age. Balancing family, school, relat..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmSN4c.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=904&amp;y=594&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Refinery29" /> <div>
-<h4 >These Heartbreaking Photos Capture How Hard It Is To Be 15 Around The World</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA6u4ZP.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Refinery29</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="413" data-m='{"i":413,"p":411,"n":"HeadlineItemViewModel","y":13,"l":"CCfiaK","h":0,"v":"lifestyle","c":"lifestylefashion","o":2}'   class="media photo"   >
-<a href="/en-us/lifestyle/fashion/see-every-gorgeous-look-from-the-victorias-secret-fashion-show-2015/ss-CCfiaK"  >
-<img alt="&lt;p>Alessandra Ambrosio&lt;/p>" data-src="{&quot;default&quot;:&quoquot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CCfdKY.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=336&amp;y=186&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Photo Credit: Getty Images" /> <div>
-<h4 >See Every Gorgeous Look from the Victoria&#39;s Secret Fashion Show 2015</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA6org5.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Glamour</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="414" data-m='{"i":414,"p":411,"n":"HeadlineItemViewModel","y":13,"l":"BBmNjWE","h":0,"v":"lifestyle","c":"lifestylelovesex","o":3}'   class="media photo"   >
-<a href="/en-us/lifestyle/love-sex/11-things-guys-may-keep-secret-from-their-girlfriends-in-new-relationships/ss-BBmNjWE"  >
-<img alt="Loving young couple in autumn morning." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CC37kf.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1570&amp;y=453&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Michaeljung/iStockphoto/Getty Images" /> <div>
-<h4 >11 Things Guys May Keep Secret From Their Girlfriends In New Relationships</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA9Afyg.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Self</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="secondary"  data-aop="secondary"  data-id="415" data-m='{"i":415,"p":404,"n":"secondary","y":8,"o":4}'>
- <li  data-id="416" data-m='{"i":416,"p":415,"n":"HeadlineItemViewModel","y":13,"l":"BBn8mWj","h":0,"v":"lifestyle","c":"lifestylevideo","o":1}'   class="media video"   >
-<a href="/en-us/lifestyle/video/lego-finally-makes-slippers-to-protect-parents-feet/vi-BBn8mWj"  >
-<img alt="LEGO finally makes slippers to protect parents&#39; feet" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn8mWh.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Buzz60 Video" /> <div>
-<h4 >LEGO finally makes slippers to protect parents&#39; feet</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBhFV9y.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Buzz60</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- 
-</div>
-    </div>
-
-                <div class="paging"></div>
-            </div>
-                <button class="rightarrow"  data-id="417" data-m='{"i":417,"p":385,"n":"rightarrow","y":12,"o":4}'></button>
-            
-        </div>
-    </div>
-    <div  class="stripecontainer"  data-nativead="40_autos_.stripecontent .tertiary li:nth-child(3)" data-section-id="stripe.autos"  data-section-id="stripe.autos">
-        <div class="autos stripeouter"  data-aop="stripe.autos_stripe"  data-id="418" data-m='{"i":418,"p":19,"n":"stripe.autos","t":"stripe","o":14}'>
-            
-                <button class="leftarrow"  data-id="419" data-m='{"i":419,"p":418,"n":"leftarrow","y":12,"o":1}'></button>
-            <div class="stripe full-width">
-                
- <div class="stripenav"  data-aop="stripe.autos.navigation_stripenavigation"  data-id="420" data-m='{"i":420,"p":418,"n":"stripe.autos.navigation","t":"stripeNavigation","o":2}'>
- 
-<ul>
- <li  data-id="421" data-m='{"i":421,"p":420,"n":"autos","y":4,"o":1}'><h2><a href="/en-us/autos"  data-id="422" data-m='{"i":422,"p":420,"n":"autos","y":4,"o":2}'>Autos</a></h2></li>
-  <li  class="hide12"  data-id="423" data-m='{"i":423,"p":420,"n":"autosresearch","y":4,"o":3}'><a href="/en-us/autos/research">RESEARCH</a></li>
- <li  class="hide12"  data-id="424" data-m='{"i":424,"p":420,"n":"autosbuying","y":4,"o":4}'><a href="/en-us/autos/buying">BUYING</a></li>
- <li  class="hide12"  data-id="425" data-m='{"i":425,"p":420,"n":"autosnews","y":4,"o":5}'><a href="/en-us/autos/news">NEWS</a></li>
- <li  class="hide12"  data-id="426" data-m='{"i":426,"p":420,"n":"autosenthusiasts","y":4,"o":6}'><a href="/en-us/autos/enthusiasts">ENTHUSIASTS</a></li>
- <li  class="hide12"  data-id="427" data-m='{"i":427,"p":420,"n":"autoshows","y":4,"o":7}'><a href="/en-us/autos/auto-shows">AUTO SHOWS</a></li>
- <li  class="hide123"  data-id="428" data-m='{"i":428,"p":420,"n":"autosvideos","y":4,"o":8}'><a href="/en-us/autos/video">VIDEO</a></li>
- <li  class="hide123"  data-id="429" data-m='{"i":429,"p":420,"n":"connected-car","y":4,"o":9}'><a href="/en-us/autos/connectedcar">CONNECTED CAR</a></li>
- <li  class="hide123"  data-id="430" data-m='{"i":430,"p":420,"n":"car-compare","y":4,"o":10}'><a href="/en-us/autos/car-compare">CAR COMPARE</a></li>
- </ul>
- <div class="stripemenu">
-<button class="edit"  data-id="431" data-m='{"i":431,"p":420,"n":"personalization","t":"dropdown","o":11}'>Edit</button>
- <button  data-id="432" data-m='{"i":432,"p":420,"n":"remove","t":"dropdownitem","o":12}' class="remove">Remove Section</button>
- <button  data-id="433" data-m='{"i":433,"p":420,"n":"moveup","t":"dropdownitem","o":13}' class="up">Move Section Up</button>
-<button  data-id="434" data-m='{"i":434,"p":420,"n":"movedown","t":"dropdownitem","o":14}' class="down">Move Section Down</button>
- <button  data-id="435" data-m='{"i":435,"p":420,"n":"addbelow","t":"dropdownitem","o":15}' class="add">Add Section Below</button>
- </div>
- 
-</div>
-    <div class="paging-container">
-
-
- <div class="autos_rlc1 start-stripe" id="researchleadclassified"  data-aop="research-lead-classified"  data-id="436" data-m='{"i":436,"p":418,"n":"research-lead-classified","y":8,"o":3}'>
- 
-<div class="autos-form-container loading">
-<form>
-<div class="rlc_type">
-  <input type="radio"
-               id="researchleadclassified-research"
-name="rlc_type"
-checked
-data-makes="{&quot;acura&quot;:{&quot;a&quot;:&quot;Acura&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdadKi&quot;},&quot;alfa-romeo&quot;:{&quot;a&quot;:&quot;Alfa Romeo&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdalxW&quot;},&quot;am-general&quot;:{&quot;a&quot;:&quot;AM General&quot;,&quot;b&quot;:false,&quot;c&quot;:&quot;AAdagko&quot;},&quot;aston-martin&quot;:{&quot;a&quot;:&quot;Aston Martin&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdalyf&quot;},&quot;audi&quot;:{&quot;a&quot;:&quot;Audi&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAbLXKK&quot;},&quot;bentley&quot;:{&quot;a&quot;:&quot;Bentley&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdadLU&quot;},&quot;bmw&quot;:{&quot;a&quot;:&quot;BMW&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAda5OV&quot;},&quot;buick&quot;:{&quot;a&quot;:&quot;Buick&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAda8tv&quot;},&quot;cadillac&quot;:{&quot;a&quot;:&quot;Cadillac&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdalAp&quot;},&quot;chevrolet&quot;:{&quot;a&quot;:&quot;Chevrolet&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAd9SUr&quot;},&quot;chrysler&quot;:{&quot;a&quot;:&quot;Chrysler&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdabeR&quot;},&quot;daewoo&quot;:{&quot;a&quot;:&quot;Daewoo&quot;,&quot;b&quot;:false,&quot;c&quot;:&quot;AAd9Y60&quot;},&quot;dodge&quot;:{&quot;a&quot;:&quot;Dodge&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAd9SW9&quot;},&quot;eagle&quot;:{&quot;a&quot;:&quot;Eagle&quot;,&quot;b&quot;:false,&quot;c&quot;:&quot;AAdaqHL&quot;},&quot;ferrari&quot;:{&quot;a&quot;:&quot;Ferrari&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAbLBvC&quot;},&quot;fiat&quot;:{&quot;a&quot;:&quot;Fiat&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAda3qk&quot;},&quot;fisker&quot;:{&quot;a&quot;:&quot;Fisker&quot;,&quot;b&quot;:false,&quot;c&quot;:&quot;AAdatjl&quot;},&quot;ford&quot;:{&quot;a&quot;:&quot;Ford&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAbNeil&quot;},&quot;geo&quot;:{&quot;a&quot;:&quot;Geo&quot;,&quot;b&quot;:false,&quot;c&quot;:&quot;AAbLjV6&quot;},&quot;gmc&quot;:{&quot;a&quot;:&quot;GMC&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdawAn&quot;},&quot;honda&quot;:{&quot;a&quot;:&quot;Honda&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAbLW64&quot;},&quot;hummer&quot;:{&quot;a&quot;:&quot;Hummer&quot;,&quot;b&quot;:false,&quot;c&quot;:&quot;AAdawAR&quot;},&quot;hyundai&quot;:{&quot;a&quot;:&quot;Hyundai&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAbLVu6&quot;},&quot;infiniti&quot;:{&quot;a&quot;:&quot;Infiniti&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAbLcHe&quot;},&quot;isuzu&quot;:{&quot;a&quot;:&quot;Isuzu&quot;,&quot;b&quot;:false,&quot;c&quot;:&quot;AAdaRfA&quot;},&quot;jaguar&quot;:{&quot;a&quot;:&quot;Jaguar&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdawBa&quot;},&quot;jeep&quot;:{&quot;a&quot;:&quot;Jeep&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdaJwn&quot;},&quot;kia&quot;:{&quot;a&quot;:&quot;Kia&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAbLXJ3&quot;},&quot;lamborghini&quot;:{&quot;a&quot;:&quot;Lamborghini&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdawBx&quot;},&quot;land-rover&quot;:{&quot;a&quot;:&quot;Land Rover&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdaRgn&quot;},&quot;lexus&quot;:{&quot;a&quot;:&quot;Lexus&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdaTQl&quot;},&quot;lincoln&quot;:{&quot;a&quot;:&quot;Lincoln&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdaGXh&quot;},&quot;lotus&quot;:{&quot;a&quot;:&quot;Lotus&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdaM5k&quot;},&quot;maserati&quot;:{&quot;a&quot;:&quot;Maserati&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdaTQv&quot;},&quot;maybach&quot;:{&quot;a&quot;:&quot;Maybach&quot;,&quot;b&quot;:false,&quot;c&quot;:&quot;AAdb6OM&quot;},&quot;mazda&quot;:{&quot;a&quot;:&quot;Mazda&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdb4eA&quot;},&quot;mclaren&quot;:{&quot;a&quot;:&quot;McLaren&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdaJxl&quot;},&quot;mercedes-benz&quot;:{&quot;a&quot;:&quot;Mercedes-Benz&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAbLSNW&quot;},&quot;mercury&quot;:{&quot;a&quot;:&quot;Mercury&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdb4f3&quot;},&quot;mini&quot;:{&quot;a&quot;:&quot;MINI&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdawCD&quot;},&quot;mitsubishi&quot;:{&quot;a&quot;:&quot;Mitsubishi&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdawCG&quot;},&quot;nissan&quot;:{&quot;a&quot;:&quot;Nissan&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdaBNI&quot;},&quot;oldsmobile&quot;:{&quot;a&quot;:&quot;Oldsmobile&quot;,&quot;b&quot;:false,&quot;c&quot;:&quot;AAdaWtk&quot;},&quot;plymouth&quot;:{&quot;a&quot;:&quot;Plymouth&quot;,&quot;b&quot;:false,&quot;c&quot;:&quot;AAbLciW&quot;},&quot;pontiac&quot;:{&quot;a&quot;:&quot;Pontiac&quot;,&quot;b&quot;:false,&quot;c&quot;:&quot;AAdaRhN&quot;},&quot;porsche&quot;:{&quot;a&quot;:&quot;Porsche&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdawCU&quot;},&quot;ram&quot;:{&quot;a&quot;:&quot;Ram&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdaZ4x&quot;},&quot;rolls-royce&quot;:{&quot;a&quot;:&quot;Rolls-Royce&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdb6Qb&quot;},&quot;saab&quot;:{&quot;a&quot;:&quot;Saab&quot;,&quot;b&quot;:false,&quot;c&quot;:&quot;AAdaBNY&quot;},&quot;saturn&quot;:{&quot;a&quot;:&quot;Saturn&quot;,&quot;b&quot;:false,&quot;c&quot;:&quot;AAdaBO1&quot;},&quot;scion&quot;:{&quot;a&quot;:&quot;Scion&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdb6Qh&quot;},&quot;smart&quot;:{&quot;a&quot;:&quot;smart&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdazdz&quot;},&quot;srt&quot;:{&quot;a&quot;:&quot;SRT&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdb1Fq&quot;},&quot;subaru&quot;:{&quot;a&quot;:&quot;Subaru&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdau1R&quot;},&quot;suzuki&quot;:{&quot;a&quot;:&quot;Suzuki&quot;,&quot;b&quot;:false,&quot;c&quot;:&quot;AAdaM6H&quot;},&quot;tesla&quot;:{&quot;a&quot;:&quot;Tesla&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdaRia&quot;},&quot;toyota&quot;:{&quot;a&quot;:&quot;Toyota&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdaBOe&quot;},&quot;volkswagen&quot;:{&quot;a&quot;:&quot;Volkswagen&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdau27&quot;},&quot;volvo&quot;:{&quot;a&quot;:&quot;Volvo&quot;,&quot;b&quot;:true,&quot;c&quot;:&quot;AAdb6QD&quot;}}"
-data-url="/en-us/autos/car-finder"
-data-allmodels="All Models"
-data-partnerlogourl=""
-data-partnersourceid=""
-data-sponsormakevalue="mazda"
-data-sponsormodelvalue="cx-5"
-data-sponsormakeid="AAdb4eA"
-data-sponsormodelid="AAbLoTm"
-data-sponsormaketext="Make (e.g. Mazda)"
-data-sponsormodeltext="Model (e.g. CX-5)"
-  data-id="437" data-m='{"i":437,"p":436,"n":"research-cars-module","y":8,"o":1}'
-hidden />
- <label for="researchleadclassified-research">Research</label>
-
-  <input type="radio"
-               id="researchleadclassified-classified"
-name="rlc_type"
-
-data-makes=""
-data-url="/en-us/autos/car-finder"
-data-allmodels="All Models"
-data-partnerlogourl="http://img-s-msn-com.akamaized.net/tenant/amp/entityid/BBiK9XG.img"
-data-partnersourceid="5236"
-data-sponsormakevalue=""
-data-sponsormodelvalue=""
-data-sponsormakeid="AAdb4eA"
-data-sponsormodelid="AAbLoTm"
-data-sponsormaketext="Make "
-data-sponsormodeltext="Model "
-  data-id="438" data-m='{"i":438,"p":436,"n":"used-car-listings-module","y":8,"o":2}'
-hidden />
- <label for="researchleadclassified-classified">Listings</label>
-
-  <input type="radio"
-               id="researchleadclassified-lead"
-name="rlc_type"
-
-data-makes=""
-data-url="/en-us/autos/car-finder"
-data-allmodels="All Models"
-data-partnerlogourl="http://img-s-msn-com.akamaized.net/tenant/amp/entityid/BBiK4VK.img"
-data-partnersourceid="5169"
-data-sponsormakevalue=""
-data-sponsormodelvalue=""
-data-sponsormakeid="AAdb4eA"
-data-sponsormodelid="AAbLoTm"
-data-sponsormaketext="Make "
-data-sponsormodeltext="Model "
-  data-id="439" data-m='{"i":439,"p":436,"n":"dealer-quote-module","y":8,"o":3}'
-hidden />
- <label for="researchleadclassified-lead">Quotes</label>
-
-</div>
-<select class="no_type"  data-id="440" data-m='{"i":440,"p":436,"n":"newused","y":5,"o":4}'>
-<option value="new">New</option>
-<option value="used">Used</option>
-<option value="both">New &amp; Used</option>
-</select>
-<select class="make"  data-id="441" data-m='{"i":441,"p":436,"n":"make","y":5,"o":5}'></select>
-<select class="model"  data-id="442" data-m='{"i":442,"p":436,"n":"model","y":5,"o":6}'></select>
-
-<input class="autos_zipcode"
-name="zipcode"
-                       placeholder="ZIP Code"
-                       title="ZIP Code"
-                       text=""
-type="text"
-                       value="98052"
- data-id="443" data-m='{"i":443,"p":436,"n":"zip","y":10,"o":7}' />
-<input class="autos_button" type="button" value="Search"  data-id="444" data-m='{"i":444,"p":436,"n":"submit","y":11,"o":8}' />
-<p>Powered by</p>
-</form>
-</div>
- <div class="tracking-pixel-container">
- 
- <div  id="button1_7c9aa653-d49c-470b-8100-652a88d1e12a"  class="smallad"   data-aop="researchleadclassified_researchleadclassified"  data-id="445" data-m='{"i":445,"p":436,"n":"ResearchLeadClassified","t":"ad","o":9}' >
-<div class="outeradcontainer">
-<div  id="button1_container_7c9aa653-d49c-470b-8100-652a88d1e12a" class="adcontainer" data-adjs='{"allowedViews":"SIZE234COLUMN"}'>
- <script class="sdkdapscript">
-                        require(["dap"], function (dap)
-                        {
- dap("&amp;AP=1025&amp;PG=AUTUSEN5N&amp;PVGUID=cc7227b7f7fe4e3bb644226f3ef2c489&amp;PROVIDERID=7HD66FC", 120, 60, "button1_container_7c9aa653-d49c-470b-8100-652a88d1e12a", {"isEnabled":0, "isDarkTheme":0}, {"scrollInit":true,"enableAdRefresh":true,"adaptiveRefresh":true,"adaptiveRefreshInterval":3000,"rid":"cc7227b7f7fe4e3bb644226f3ef2c489"});
- });
-</script>
- </div>
- 
-</div>
-</div>
-
-</div>
- 
-</div>
-
-
- <div  class="stripecontent normaldensity"  data-module-id="startpage|stripe.autos|stripe|stripe.autos.topstories|headlines"  data-aop="top stories"  data-id="446" data-m='{"i":446,"p":418,"n":"stripe.autos.topstories","t":"headlines","o":4}'>
- 
- <ul class="secondary"  data-aop="secondary"  data-id="447" data-m='{"i":447,"p":446,"n":"secondary","y":8,"o":1}'>
- <li  data-id="448" data-m='{"i":448,"p":447,"n":"HeadlineItemViewModel","y":13,"l":"BBnahtI","h":0,"v":"autos","c":"autosenthusiasts","o":1}'  >
-<a href="/en-us/autos/enthusiasts/the-v-8-corvair-every-chevy-guy-dreams-of-building/ar-BBnahtI?li=AA8mH2"  >
-<img alt="1965 Chevy Corvair Rear View" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnaf02.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=969&amp;y=783&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Hotrod" /> <div>
-<h4 >The Car Every Chevy Guy Dreams of Building</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB5a8hM.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Hot Rod</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="449" data-m='{"i":449,"p":446,"n":"tertiary","y":8,"o":2}'>
- <li  data-id="450" data-m='{"i":450,"p":449,"n":"HeadlineItemViewModel","y":13,"l":"BBn6492","h":0,"v":"autos","c":"autosmidsize","o":1}'  >
-<a href="/en-us/autos/autos-midsize/the-2016-motor-trend-suv-of-the-year-is/ar-BBn6492?li=AA8mH2"  >
-<img alt="2016-Volvo-XC90-front-three-quarters-in-motion" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CC8y3M.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by MotorTrend" /> <div>
-<h4 >The Motor Trend SUV of the Year is...</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA2CNVO.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Motor Trend</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="451" data-m='{"i":451,"p":449,"n":"HeadlineItemViewModel","y":13,"o":2}'  >
-<a href="http://www.msn.com/en-us/autos/infiniti/sd-AAbLcHe"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn8Y2m.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Infiniti" /> <div>
-<h4 >Research the hottest new cars from Infiniti on MSN Autos</h4>
-
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="452" data-m='{"i":452,"p":449,"n":"HeadlineItemViewModel","y":13,"l":"BBn5ZAH","h":0,"v":"autos","c":"autoscartech","o":3}'  >
-<a href="/en-us/autos/car-tech/2017-ford-escape-debuts-cranks-up-the-technology/ar-BBn5ZAH?li=AA8mH2"  >
-<img alt="2017 Ford Escape Titanium" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn5Ztr.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1166&amp;y=753&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Manufacturer" /> <div>
-<h4 >2017 Ford Escape Debuts, Cranks Up the Technology</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBienk9.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Car and Driver</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="secondary"  data-aop="secondary"  data-id="453" data-m='{"i":453,"p":446,"n":"secondary","y":8,"o":3}'>
- <li  data-id="454" data-m='{"i":454,"p":453,"n":"HeadlineItemViewModel","y":13,"o":1}'  >
-<a href="http://www.msn.com/en-us/autos/auto-shows/los-angeles"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBna4q6.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=749&amp;y=500&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Consumer Reports" /> <div>
-<h4 >9 Hot New Debuts from the LA Auto Show</h4>
-
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- 
-</div>
-    </div>
-
-                <div class="paging"></div>
-            </div>
-                <button class="rightarrow"  data-id="455" data-m='{"i":455,"p":418,"n":"rightarrow","y":12,"o":5}'></button>
-            
-        </div>
-    </div>
-    <div  class="stripecontainer"  data-section-id="stripe.health"  data-section-id="stripe.health">
-        <div class="healthfitness stripeouter"  data-aop="stripe.health_stripe"  data-id="456" data-m='{"i":456,"p":19,"n":"stripe.health","t":"stripe","o":15}'>
-            
-                <button class="leftarrow"  data-id="457" data-m='{"i":457,"p":456,"n":"leftarrow","y":12,"o":1}'></button>
-            <div class="stripe full-width">
-                
- <div class="stripenav"  data-aop="stripe.health.navigation_stripenavigation"  data-id="458" data-m='{"i":458,"p":456,"n":"stripe.health.navigation","t":"stripeNavigation","o":2}'>
- 
-<ul>
- <li  data-id="459" data-m='{"i":459,"p":458,"n":"health","y":4,"o":1}'><h2><a href="/en-us/health"  data-id="460" data-m='{"i":460,"p":458,"n":"health","y":4,"o":2}'>Health &amp; Fitness</a></h2></li>
-  <li  class="hide12"  data-id="461" data-m='{"i":461,"p":458,"n":"listlink","y":4,"l":"WEIGHT LOSS","o":3}'><a href="/en-us/health/weightloss">WEIGHT LOSS</a></li>
- <li  class="hide12"  data-id="462" data-m='{"i":462,"p":458,"n":"listlink","y":4,"l":"FITNESS","o":4}'><a href="/en-us/health/fitness">FITNESS</a></li>
- <li  class="hide12"  data-id="463" data-m='{"i":463,"p":458,"n":"listlink","y":4,"l":"NUTRITION","o":5}'><a href="/en-us/health/Nutrition">NUTRITION</a></li>
- <li  class="hide12"  data-id="464" data-m='{"i":464,"p":458,"n":"listlink","y":4,"l":"MEDICAL","o":6}'><a href="/en-us/health/medical">MEDICAL</a></li>
- <li  class="hide12"  data-id="465" data-m='{"i":465,"p":458,"n":"listlink","y":4,"l":"WELLNESS","o":7}'><a href="/en-us/health/wellness">WELLNESS</a></li>
- <li  class="hide123"  data-id="466" data-m='{"i":466,"p":458,"n":"listlink","y":4,"l":"PREGNANCY \u0026 PARENTING","o":8}'><a href="/en-us/health/pregnancyparenting">PREGNANCY &amp; PARENTING</a></li>
- <li  class="hide123"  data-id="467" data-m='{"i":467,"p":458,"n":"listlink","y":4,"l":"TOOLS \u0026 REFERENCE","o":9}'><a href="/en-us/health/tools-and-reference">TOOLS &amp; REFERENCE</a></li>
- </ul>
- <div class="stripemenu">
-<button class="edit"  data-id="468" data-m='{"i":468,"p":458,"n":"personalization","t":"dropdown","o":10}'>Edit</button>
- <button  data-id="469" data-m='{"i":469,"p":458,"n":"remove","t":"dropdownitem","o":11}' class="remove">Remove Section</button>
- <button  data-id="470" data-m='{"i":470,"p":458,"n":"moveup","t":"dropdownitem","o":12}' class="up">Move Section Up</button>
-<button  data-id="471" data-m='{"i":471,"p":458,"n":"movedown","t":"dropdownitem","o":13}' class="down">Move Section Down</button>
- <button  data-id="472" data-m='{"i":472,"p":458,"n":"addbelow","t":"dropdownitem","o":14}' class="add">Add Section Below</button>
- </div>
- 
-</div>
-    <div class="paging-container">
-
- <div  class="stripecontent normaldensity"  data-module-id="startpage|stripe.health|stripe|stripe.health.topstories|headlines"  data-aop="top stories"  data-id="473" data-m='{"i":473,"p":456,"n":"stripe.health.topstories","t":"headlines","o":3}'>
- 
- <ul class="secondary"  data-aop="secondary"  data-id="474" data-m='{"i":474,"p":473,"n":"secondary","y":8,"o":1}'>
- <li  data-id="475" data-m='{"i":475,"p":474,"n":"HeadlineItemViewModel","y":13,"l":"BBmYFpv","h":0,"v":"health","c":"weightloss","o":1}'  >
-<a href="/en-us/health/weightloss/14-new-ways-to-lose-your-belly-in-14-days/ar-BBmYFpv?li=AA51YJ"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmYCX5.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1353&amp;y=1210&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Getty Images" /> <div>
-<h4 >14 New Ways to Lose Your Belly in 14 Days</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA9YFNL.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Eat This, Not That!</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="476" data-m='{"i":476,"p":473,"n":"tertiary","y":8,"o":2}'>
- <li  data-id="477" data-m='{"i":477,"p":476,"n":"HeadlineItemViewModel","y":13,"l":"BBnaBb2","h":0,"v":"health","c":"nutrition","o":1}'   class="media photo"   >
-<a href="/en-us/health/nutrition/20-things-that-happen-to-your-body-when-you-eat-fast-food/ss-BBnaBb2"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBnaBkH.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Eat This Not That" /> <div>
-<h4 >20 Things That Happen to Your Body When You Eat Fast Food</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA9YFNL.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Eat This, Not That!</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="478" data-m='{"i":478,"p":476,"n":"HeadlineItemViewModel","y":13,"l":"BBn8DnZ","h":0,"v":"health","c":"nutrition","o":2}'   class="media photo"   >
-<a href="/en-us/health/nutrition/foods-that-cause-unwanted-bathroom-trips-at-work/ss-BBn8DnZ"  >
-<img alt="&lt;p>Can&#39;t decide what to pack for your work lunch tomorrow? Wanting to avoid the ..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn8ALO.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=401&amp;y=276&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Gourmandize" /> <div>
-<h4 >10 Foods That Make You Go</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB5Z4Yd.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Gourmandize</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="479" data-m='{"i":479,"p":476,"n":"HeadlineItemViewModel","y":13,"l":"BBhBtTw","h":0,"v":"health","c":"medical","o":3}'   class="media photo"   >
-<a href="/en-us/health/medical/16-signs-you-may-have-hiv/ss-BBhBtTw"  >
-<img alt="Sick woman taking her temperature" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA7RciO.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1706&amp;y=601&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="OJO Images/Getty Images" /> <div>
-<h4 >16 Signs You May Have HIV</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB4jqVP.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Health.com</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="480" data-m='{"i":480,"p":473,"n":"tertiary","y":8,"o":3}'>
- <li  data-id="481" data-m='{"i":481,"p":480,"n":"HeadlineItemViewModel","y":13,"l":"BBn6oZm","h":0,"v":"health","c":"medical","o":1}'   class="media video"   >
-<a href="/en-us/health/medical/woman-spends-dollar100k-to-look-like-kim-kardashian/vi-BBn6oZm"  >
-<img alt="Woman Spends $100K to Look Like Kim Kardashian" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn6mEl.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=320&amp;y=177&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="AOL" /> <div>
-<h4 >Woman Spends $100K to Look Like Kim Kardashian</h4>
-
- <span>The Doctors</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="482" data-m='{"i":482,"p":480,"n":"HeadlineItemViewModel","y":13,"l":"BBmVFa7","h":0,"v":"health","c":"wellness","o":2}'  >
-<a href="/en-us/health/wellness/why-you-should-never-get-your-ears-pierced-at-the-mall/ar-BBmVFa7?li=AA51YJ"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBna46G.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1241&amp;y=548&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Fly_dragonfly/iStock/Getty Images" /> <div>
-<h4 >Why You Should Never Get Your Ears Pierced at the Mall</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA9z9sE.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Good Housekeeping</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="483" data-m='{"i":483,"p":480,"n":"HeadlineItemViewModel","y":13,"l":"BBn5hIe","h":0,"v":"health","c":"medical","o":3}'   class="media photo"   >
-<a href="/en-us/health/medical/you-know-you-need-to-drink-water-when/ss-BBn5hIe"  >
-<img alt="&lt;p>Dry mouth leads to bad breath. You need salvia to fight &lt;a href=&quot;http://www.e..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn551m.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=487&amp;y=278&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="POPSUGAR Photography / Mark Popovich" /> <div>
-<h4 >5 Signs You Need to Drink More Water</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA6zYWg.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>PopSugar</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="secondary"  data-aop="secondary"  data-id="484" data-m='{"i":484,"p":473,"n":"secondary","y":8,"o":4}'>
- <li  data-id="485" data-m='{"i":485,"p":484,"n":"HeadlineItemViewModel","y":13,"l":"BBkcCK5","h":0,"v":"health","c":"medical","o":1}'  >
-<a href="/en-us/health/medical/the-main-differences-between-advil-tylenol-aleve-and-aspirin-summed-up-in-one-chart/ar-BBkcCK5?li=AA51YJ"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn4DDg.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=976&amp;y=857&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Photo Inc/Science Source/Getty Images" /> <div>
-<h4 >The differences between Advil, Tylenol, Aleve, and Aspirin in one chart</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA42urS.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Business Insider</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="secondary"  data-aop="secondary"  data-id="486" data-m='{"i":486,"p":473,"n":"secondary","y":8,"o":5}'>
- <li  data-id="487" data-m='{"i":487,"p":486,"n":"HeadlineItemViewModel","y":13,"l":"BBn5w5W","h":0,"v":"health","c":"medical","o":1}'  >
-<a href="/en-us/health/medical/10-things-your-nails-can-tell-you-about-your-health/ar-BBn5w5W?li=AA51YJ"  >
-<img alt="Photo: Getty Images" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn5tzx.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=175&amp;y=199&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by health.com" /> <div>
-<h4 >10 Things Your Nails Can Tell You About Your Health</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB4jqVP.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Health.com</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- 
-</div>
-    </div>
-
-                <div class="paging"></div>
-            </div>
-                <button class="rightarrow"  data-id="488" data-m='{"i":488,"p":456,"n":"rightarrow","y":12,"o":4}'></button>
-            
-        </div>
-    </div>
-    <div  class="stripecontainer"  data-nativead="40_foodanddrink_.stripecontent .tertiary li:nth-child(3)" data-section-id="stripe.foodanddrink"  data-section-id="stripe.foodanddrink">
-        <div class="fooddrink stripeouter"  data-aop="stripe.foodanddrink_stripe"  data-id="489" data-m='{"i":489,"p":19,"n":"stripe.foodanddrink","t":"stripe","o":16}'>
-            
-                <button class="leftarrow"  data-id="490" data-m='{"i":490,"p":489,"n":"leftarrow","y":12,"o":1}'></button>
-            <div class="stripe full-width">
-                
- <div class="stripenav"  data-aop="stripe.foodanddrink.navigation_stripenavigation"  data-id="491" data-m='{"i":491,"p":489,"n":"stripe.foodanddrink.navigation","t":"stripeNavigation","o":2}'>
- 
-<ul>
- <li  data-id="492" data-m='{"i":492,"p":491,"n":"foodanddrink","y":4,"o":1}'><h2><a href="/en-us/foodanddrink"  data-id="493" data-m='{"i":493,"p":491,"n":"foodanddrink","y":4,"o":2}'>Food &amp; Drink</a></h2></li>
-  <li  class="hide12"  data-id="494" data-m='{"i":494,"p":491,"n":"cooking","y":4,"o":3}'><a href="/en-us/foodanddrink/cooking">COOKING</a></li>
- <li  class="hide12"  data-id="495" data-m='{"i":495,"p":491,"n":"restaurantsandnews","y":4,"o":4}'><a href="/en-us/foodanddrink/restaurantsandnews">RESTAURANTS &amp; NEWS</a></li>
- <li  class="hide12"  data-id="496" data-m='{"i":496,"p":491,"n":"beverages","y":4,"o":5}'><a href="/en-us/foodanddrink/beverages">BEVERAGES</a></li>
- <li  class="hide12"  data-id="497" data-m='{"i":497,"p":491,"n":"partiesandentertaining","y":4,"o":6}'><a href="/en-us/foodanddrink/partiesandentertaining">SEASONAL</a></li>
- <li  class="hide12"  data-id="498" data-m='{"i":498,"p":491,"n":"videos","y":4,"o":7}'><a href="/en-us/foodanddrink/video">VIDEO</a></li>
- </ul>
- <div class="stripemenu">
-<button class="edit"  data-id="499" data-m='{"i":499,"p":491,"n":"personalization","t":"dropdown","o":8}'>Edit</button>
- <button  data-id="500" data-m='{"i":500,"p":491,"n":"remove","t":"dropdownitem","o":9}' class="remove">Remove Section</button>
- <button  data-id="501" data-m='{"i":501,"p":491,"n":"moveup","t":"dropdownitem","o":10}' class="up">Move Section Up</button>
-<button  data-id="502" data-m='{"i":502,"p":491,"n":"movedown","t":"dropdownitem","o":11}' class="down">Move Section Down</button>
- <button  data-id="503" data-m='{"i":503,"p":491,"n":"addbelow","t":"dropdownitem","o":12}' class="add">Add Section Below</button>
- </div>
- 
-</div>
-    <div class="paging-container">
-
- <div  class="stripecontent normaldensity"  data-module-id="startpage|stripe.foodanddrink|stripe|stripe.foodanddrink.topstories|headlines"  data-aop="top stories"  data-id="504" data-m='{"i":504,"p":489,"n":"stripe.foodanddrink.topstories","t":"headlines","o":3}'>
- 
- <ul class="secondary"  data-aop="secondary"  data-id="505" data-m='{"i":505,"p":504,"n":"secondary","y":8,"o":1}'>
- <li  data-id="506" data-m='{"i":506,"p":505,"n":"HeadlineItemViewModel","y":13,"l":"BBmA9g0","h":0,"v":"foodanddrink","c":"recipes","o":1}'   class="media photo"   >
-<a href="/en-us/foodanddrink/recipes/thanksgiving-helper-slow-cooker-ideas-for-an-easy-dinner/ss-BBmA9g0"  >
-<img alt="&lt;p>Did you ever think stuffing could be so easy?&lt;/p>&lt;p>Get the recipe from &lt;a hr..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmzZ2u.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=312&amp;y=264&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Courtesy of The Creative Bite" /> <div>
-<h4 >Thanksgiving Helper: Slow-Cooker Ideas for an Easy Dinner</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAaeOki.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Delish</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="507" data-m='{"i":507,"p":504,"n":"tertiary","y":8,"o":2}'>
- <li  data-id="508" data-m='{"i":508,"p":507,"n":"HeadlineItemViewModel","y":13,"l":"BBmkrQW","h":0,"v":"foodanddrink","c":"recipes","o":1}'   class="media photo"   >
-<a href="/en-us/foodanddrink/recipes/the-26-best-turkey-recipes-for-thanksgiving/ss-BBmkrQW"  >
-<img alt="&lt;p>This holiday recipe may be simple, but it&#39;s sure to be a crowd pleaser.&lt;/p>&lt;p..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CC3slk.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Getty Images" /> <div>
-<h4 >The 26 Best Turkey Recipes for Thanksgiving</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBiuSr7.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Country Living</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="509" data-m='{"i":509,"p":507,"n":"HeadlineItemViewModel","y":13,"l":"CC2wOx","h":0,"v":"foodanddrink","c":"recipes","o":2}'  >
-<a href="/en-us/foodanddrink/recipes/4-new-thanksgiving-turkey-recipes-for-2015/ar-CC2wOx?li=BBgdrt0"  >
-<img alt="porchetta-style-roast-turkey-breast" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CC2zpn.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=510&amp;y=509&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Christopher Testani" /> <div>
-<h4 >4 New Thanksgiving Turkey Recipes for 2015</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3Ek8w.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Bon App&#233;tit</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="510" data-m='{"i":510,"p":507,"n":"HeadlineItemViewModel","y":13,"l":"BBmA9iy","h":0,"v":"foodanddrink","c":"recipes","o":3}'   class="media photo"   >
-<a href="/en-us/foodanddrink/recipes/20-best-ever-recipes-for-thanksgiving-appetizers/ss-BBmA9iy"  >
-<img alt="&lt;p>Of course you can have dessert before dinner. It&#39;s THANKSGIVING.&lt;/p>&lt;p>Get th..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmzWEL.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=979&amp;y=637&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Ethan Calabrese" /> <div>
-<h4 >20 Best-Ever Recipes for Thanksgiving Appetizers</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAaeOki.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Delish</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="511" data-m='{"i":511,"p":504,"n":"tertiary","y":8,"o":3}'>
- <li  data-id="512" data-m='{"i":512,"p":511,"n":"HeadlineItemViewModel","y":13,"l":"CC2DCW","h":0,"v":"foodanddrink","c":"tipsandtricks","o":1}'   class="media photo"   >
-<a href="/en-us/foodanddrink/tipsandtricks/the-4-thanksgiving-cooking-tools-you-didnt-know-you-needed/ss-CC2DCW"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CC2Di0.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=497&amp;y=479&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Epicurious" /> <div>
-<h4 >The 4 Thanksgiving Cooking Tools You Didn&#39;t Know You Needed</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA9Aicg.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Epicurious</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="513" data-m='{"i":513,"p":511,"n":"HeadlineItemViewModel","y":13,"l":"CCgacP","h":0,"v":"foodanddrink","c":"tipsandtricks","o":2}'  >
-<a href="/en-us/foodanddrink/tipsandtricks/everything-you-need-to-know-about-buying-storing-and-roasting-a-turkey/ar-CCgacP?li=BBgdrt0"  >
-<img alt="Everything You Need to Know About Buying, Storing and Roasting a Turkey" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CCg4Zd.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=813&amp;y=512&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Good Housekeeping" /> <div>
-<h4 >Everything You Need to Know About Buying, Storing and Roasting a Turkey</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA9z9sE.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Good Housekeeping</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="514" data-m='{"i":514,"p":511,"n":"HeadlineItemViewModel","y":13,"l":"BBmzOpX","h":0,"v":"foodanddrink","c":"foodculture","o":3}'  >
-<a href="/en-us/foodanddrink/foodculture/theres-a-reason-why-cranberry-sauce-cans-are-upside-down/ar-BBmzOpX?li=BBgdrt0"  >
-<img alt="There&#39;s a Reason Why Cranberry Sauce Cans are Upside Down" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmzwGX.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=357&amp;y=536&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Ocean Spray" /> <div>
-<h4 >There&#39;s a Reason Why Cranberry Sauce Cans are Upside Down</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AAaeOki.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Delish</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="secondary"  data-aop="secondary"  data-id="515" data-m='{"i":515,"p":504,"n":"secondary","y":8,"o":4}'>
- <li  data-id="516" data-m='{"i":516,"p":515,"n":"HeadlineItemViewModel","y":13,"l":"CC4Hzc","h":0,"v":"foodanddrink","c":"recipes","o":1}'  >
-<a href="/en-us/foodanddrink/recipes/7-salads-to-lighten-up-your-thanksgiving-feast/ar-CC4Hzc?li=BBgdrt0"  >
-<img alt="kale1" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CC4EYv.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=373&amp;y=326&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Food52" /> <div>
-<h4 >7 Salads to Lighten Up Your Thanksgiving Feast</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBhDx7y.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Food52</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- 
-</div>
-    </div>
-
-                <div class="paging"></div>
-            </div>
-                <button class="rightarrow"  data-id="517" data-m='{"i":517,"p":489,"n":"rightarrow","y":12,"o":4}'></button>
-            
-        </div>
-    </div>
-    <div  class="stripecontainer"  data-nativead="40_travel_.stripecontent .tertiary li:nth-child(3)" data-section-id="stripe.travel"  data-section-id="stripe.travel">
-        <div class="travel stripeouter"  data-aop="stripe.travel_stripe"  data-id="518" data-m='{"i":518,"p":19,"n":"stripe.travel","t":"stripe","o":17}'>
-            
-                <button class="leftarrow"  data-id="519" data-m='{"i":519,"p":518,"n":"leftarrow","y":12,"o":1}'></button>
-            <div class="stripe full-width">
-                
- <div class="stripenav"  data-aop="stripe.travel.navigation_stripenavigation"  data-id="520" data-m='{"i":520,"p":518,"n":"stripe.travel.navigation","t":"stripeNavigation","o":2}'>
- 
-<ul>
- <li  data-id="521" data-m='{"i":521,"p":520,"n":"travel","y":4,"o":1}'><h2><a href="/en-us/travel"  data-id="522" data-m='{"i":522,"p":520,"n":"travel","y":4,"o":2}'>Travel</a></h2></li>
-  <li  class="hide12"  data-id="523" data-m='{"i":523,"p":520,"n":"traveltripideas","y":4,"o":3}'><a href="/en-us/travel/tripideas">TRIP IDEAS</a></li>
- <li  class="hide12"  data-id="524" data-m='{"i":524,"p":520,"n":"travelnews","y":4,"o":4}'><a href="/en-us/travel/news">NEWS</a></li>
- <li  class="hide12"  data-id="525" data-m='{"i":525,"p":520,"n":"video","y":4,"o":5}'><a href="/en-us/travel/video">VIDEO</a></li>
- <li  class="hide12"  data-id="526" data-m='{"i":526,"p":520,"n":"hotels","y":4,"o":6}'><a href="/en-us/travel/hotels">HOTEL SEARCH</a></li>
- <li  class="hide12"  data-id="527" data-m='{"i":527,"p":520,"n":"flights","y":4,"o":7}'><a href="/en-us/travel/flights">FLIGHT SEARCH</a></li>
- <li  class="hide123"  data-id="528" data-m='{"i":528,"p":520,"n":"flightstatus","y":4,"o":8}'><a href="/en-us/travel/flight-status">FLIGHT STATUS</a></li>
- <li  class="hide123"  data-id="529" data-m='{"i":529,"p":520,"n":"travelweekendwarriors","y":4,"o":9}'><a href="/en-us/travel/weekendwarriors">WEEKEND WARRIORS</a></li>
- <li  class="hide123"  data-id="530" data-m='{"i":530,"p":520,"n":"travel-holiday-travel-en-us","y":4,"o":10}'><a href="/en-us/travel/holiday-travel">HOLIDAY GUIDE</a></li>
- </ul>
- <div class="stripemenu">
-<button class="edit"  data-id="531" data-m='{"i":531,"p":520,"n":"personalization","t":"dropdown","o":11}'>Edit</button>
- <button  data-id="532" data-m='{"i":532,"p":520,"n":"remove","t":"dropdownitem","o":12}' class="remove">Remove Section</button>
- <button  data-id="533" data-m='{"i":533,"p":520,"n":"moveup","t":"dropdownitem","o":13}' class="up">Move Section Up</button>
-<button  data-id="534" data-m='{"i":534,"p":520,"n":"movedown","t":"dropdownitem","o":14}' class="down">Move Section Down</button>
- <button  data-id="535" data-m='{"i":535,"p":520,"n":"addbelow","t":"dropdownitem","o":15}' class="add">Add Section Below</button>
- </div>
- 
-</div>
-    <div class="paging-container">
-
- <div  class="stripecontent normaldensity"  data-module-id="startpage|stripe.travel|stripe|stripe.travel.topstories|headlines"  data-aop="top stories"  data-id="536" data-m='{"i":536,"p":518,"n":"stripe.travel.topstories","t":"headlines","o":3}'>
- 
- <ul class="secondary"  data-aop="secondary"  data-id="537" data-m='{"i":537,"p":536,"n":"secondary","y":8,"o":1}'>
- <li  data-id="538" data-m='{"i":538,"p":537,"n":"HeadlineItemViewModel","y":13,"l":"BBn9Zj9","h":0,"v":"travel","c":"travelarticle","o":1}'  >
-<a href="/en-us/travel/article/heres-what-its-really-like-to-be-an-emirates-flight-attendant/ar-BBn9Zj9?li=AA5hNe"  >
-<img alt="D" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9RvO.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1041&amp;y=378&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Emirates" /> <div>
-<h4 >Flight Attendant Reveals What It&#39;s REALLY Like to Work for Emirates</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3dVQj.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>The Huffington Post</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="539" data-m='{"i":539,"p":536,"n":"tertiary","y":8,"o":2}'>
- <li  data-id="540" data-m='{"i":540,"p":539,"n":"HeadlineItemViewModel","y":13,"l":"BBna1N8","h":0,"v":"travel","c":"travelnews","o":1}'  >
-<a href="/en-us/travel/news/deltas-plan-to-make-its-food-taste-better/ar-BBna1N8?li=AA5hNe"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9ZMz.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1178&amp;y=436&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by CNBC" /> <div>
-<h4 >How Delta plans to make its food tastier</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3ltd8.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>CNBC</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="541" data-m='{"i":541,"p":539,"n":"HeadlineItemViewModel","y":13,"l":"BBn585f","h":0,"v":"travel","c":"travelnews","o":2}'  >
-<a href="/en-us/travel/news/what-you-need-to-know-about-traveling-to-paris-right-now/ar-BBn585f?li=AA5hNe"  >
-<img alt="Paris DG" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn5iIP.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Getty Images" /> <div>
-<h4 >What You Need to Know About Traveling to Paris Right Now</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBm2Dvk.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Travel + Leisure</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="542" data-m='{"i":542,"p":539,"n":"HeadlineItemViewModel","y":13,"l":"CCcyY8","h":0,"v":"travel","c":"travelarticle","o":3}'  >
-<a href="/en-us/travel/article/the-8-things-you-should-always-pack-in-your-carry-on/ar-CCcyY8?li=AA5hNe"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CCcZKO.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=583&amp;y=1054&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="REUTERS/Alessandro Garofalo" /> <div>
-<h4 >Things you should always pack in your carry-on</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBiNnLK.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Cond&#233; Nast Traveler</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="secondary"  data-aop="secondary"  data-id="543" data-m='{"i":543,"p":536,"n":"secondary","y":8,"o":3}'>
- <li  data-id="544" data-m='{"i":544,"p":543,"n":"HeadlineItemViewModel","y":13,"l":"BBmkPWO","h":0,"v":"travel","c":"travelarticle","o":1}'  >
-<a href="/en-us/travel/article/8-amazing-sites-weve-got-to-protect/ar-BBmkPWO?li=AA5hNe"  >
-<img alt="World Monument Watch" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmkFIy.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=403&amp;y=296&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by TIME Inc." /> <div>
-<h4 >8 Amazing Sites We&#39;ve Got to Protect</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBm2Dvk.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Travel + Leisure</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="secondary"  data-aop="secondary"  data-id="545" data-m='{"i":545,"p":536,"n":"secondary","y":8,"o":4}'>
- <li  data-id="546" data-m='{"i":546,"p":545,"n":"HeadlineItemViewModel","y":13,"l":"BBn4IsE","h":0,"v":"travel","c":"video","o":1}'   class="media video"   >
-<a href="/en-us/travel/video/rome-italy-top-travel-nos-and-gos/vi-BBn4IsE"  >
-<img alt="Rome, Italy: Top Travel No&#39;s &amp; Go&#39;s" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn4PZd.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=955&amp;y=906&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Scripps" /> <div>
-<h4 >What to do (and what not do) on your visit to Rome</h4>
-
- <span>Travel Channel</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- 
-</div>
-    </div>
-
-                <div class="paging"></div>
-            </div>
-                <button class="rightarrow"  data-id="547" data-m='{"i":547,"p":518,"n":"rightarrow","y":12,"o":4}'></button>
-            
-        </div>
-    </div>
-    <div  class="stripecontainer"  data-section-id="stripe.photos"  data-section-id="stripe.photos">
-        <div class="entertainment stripeouter"  data-aop="stripe.photos_stripe"  data-id="548" data-m='{"i":548,"p":19,"n":"stripe.photos","t":"stripe","o":18}'>
-            
-                <button class="leftarrow"  data-id="549" data-m='{"i":549,"p":548,"n":"leftarrow","y":12,"o":1}'></button>
-            <div class="stripe full-width">
-                
- <div class="stripenav"  data-aop="stripe.photos.navigation_stripenavigation"  data-id="550" data-m='{"i":550,"p":548,"n":"stripe.photos.navigation","t":"stripeNavigation","o":2}'>
- 
-<ul>
- <li  data-id="551" data-m='{"i":551,"p":550,"n":"gallery_photos_text","y":4,"o":1}'><h2><a href="http://www.msn.com/en-us/news/photos/best-pictures-of-the-week-january-23-2015/ss-AA8tR67"  data-id="552" data-m='{"i":552,"p":550,"n":"gallery_photos_text","y":4,"o":2}'>Photos</a></h2></li>
-  </ul>
- <div class="stripemenu">
-<button class="edit"  data-id="553" data-m='{"i":553,"p":550,"n":"personalization","t":"dropdown","o":3}'>Edit</button>
- <button  data-id="554" data-m='{"i":554,"p":550,"n":"remove","t":"dropdownitem","o":4}' class="remove">Remove Section</button>
- <button  data-id="555" data-m='{"i":555,"p":550,"n":"moveup","t":"dropdownitem","o":5}' class="up">Move Section Up</button>
-<button  data-id="556" data-m='{"i":556,"p":550,"n":"movedown","t":"dropdownitem","o":6}' class="down">Move Section Down</button>
- <button  data-id="557" data-m='{"i":557,"p":550,"n":"addbelow","t":"dropdownitem","o":7}' class="add">Add Section Below</button>
- </div>
- 
-</div>
-    <div class="paging-container">
-
- <div  class="stripecontent normaldensity"  data-module-id="startpage|stripe.photos|stripe|stripe.photos.topstories|headlines"  data-aop="stories"  data-id="558" data-m='{"i":558,"p":548,"n":"stripe.photos.topstories","t":"headlines","o":3}'>
- 
- <ul class="secondary"  data-aop="secondary"  data-id="559" data-m='{"i":559,"p":558,"n":"secondary","y":8,"o":1}'>
- <li  data-id="560" data-m='{"i":560,"p":559,"n":"HeadlineItemViewModel","y":13,"l":"CCbfDv","h":0,"v":"travel","c":"traveltips","o":1}'   class="media photo"   >
-<a href="/en-us/travel/tips/40-airport-secrets-only-insiders-know/ss-CCbfDv"  >
-<img alt="&lt;p>Airports often mean long lines, big crowds and a looming headache for travele..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CCbfyO.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=951&amp;y=420&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by GoBankingRates" /> <div>
-<h4 >Airport secrets only insiders know</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB5RXZj.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>GoBankingRates</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="561" data-m='{"i":561,"p":558,"n":"tertiary","y":8,"o":2}'>
- <li  data-id="562" data-m='{"i":562,"p":561,"n":"HeadlineItemViewModel","y":13,"l":"BBmW5ht","h":0,"v":"movies","c":"movies-gallery","o":1}'   class="media photo"   >
-<a href="/en-us/movies/gallery/11-must-see-movies-starring-celebrity-couples/ss-BBmW5ht"  >
-<img alt="The movie responsible for making Brangelina a thing, &quot;&lt;a href=&quot;http://www.movief..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmW5hl.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=288&amp;y=171&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="20th Century Fox" /> <div>
-<h4 >11 Must-See Movies Starring Celebrity Couples</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBgcH6l.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Moviefone</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="563" data-m='{"i":563,"p":561,"n":"HeadlineItemViewModel","y":13,"l":"BBmsUFz","h":0,"v":"sports","c":"basketball_nba","o":2}'   class="media photo"   >
-<a href="/en-us/sports/nba/the-best-dunkers-in-the-nba/ss-BBmsUFz"  >
-<img alt="Say what you will about Blake Griffin, the Clippers superstar is poetry in motio..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmsS45.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=683&amp;y=553&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Stephen Dunn/Getty Images" /> <div>
-<h4 >The best dunkers in the NBA</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA3ldrf.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Yardbarker</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="564" data-m='{"i":564,"p":561,"n":"HeadlineItemViewModel","y":13,"l":"CC8juo","h":0,"v":"finance","c":"finance-real-estate","o":3}'   class="media photo"   >
-<a href="/en-us/money/realestate/10-cheapest-states-to-raise-a-family/ss-CC8juo"  >
-<img alt="&lt;p>When it comes to affordability for families, Tennessee comes out on top due t..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/CC8gPs.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=1096&amp;y=796&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by GoBankingRates" /> <div>
-<h4 >10 Cheapest States to Raise a Family</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB5RXZj.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>GoBankingRates</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="565" data-m='{"i":565,"p":558,"n":"tertiary","y":8,"o":3}'>
- <li  data-id="566" data-m='{"i":566,"p":565,"n":"HeadlineItemViewModel","y":13,"l":"BBmSQIj","h":0,"v":"autos","c":"autosfinanceinsurance","o":1}'  >
-<a href="/en-us/autos/autos-financeinsurance/winter-car-survival-tips/ar-BBmSQIj?li=AA8884E"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmSJff.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=783&amp;y=803&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by Edmunds" /> <div>
-<h4 >Winter Car Survival Tips</h4>
-
- <span>Edmunds</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="567" data-m='{"i":567,"p":565,"n":"HeadlineItemViewModel","y":13,"l":"BBmSGAI","h":0,"v":"lifestyle","c":"lifestyleparenting","o":2}'   class="media photo"   >
-<a href="/en-us/lifestyle/parenting/23-bittersweet-milestones-all-moms-encounter/ss-BBmSGAI"  >
-<img alt="Mom talking joyfully with toddler girl in mall" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmSLQH.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=846&amp;y=756&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Flickr RF/Getty Images" /> <div>
-<h4 >Those bittersweet moments moms go through</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBeSLZi.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Mom.me</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="568" data-m='{"i":568,"p":565,"n":"HeadlineItemViewModel","y":13,"l":"BBmznDP","h":0,"v":"foodanddrink","c":"recipes","o":3}'   class="media photo"   >
-<a href="/en-us/foodanddrink/recipes/29-totally-unexpected-thanksgiving-sides/ss-BBmznDP"  >
-<img alt="&lt;p>&lt;strong>Get the recipe&lt;/strong>: &lt;a href=&quot;http://ladyandpups.com/2013/11/19/r..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmzsPz.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Lady and Pups" /> <div>
-<h4 >29 Totally Unexpected Thanksgiving Sides</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA6zYWg.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>PopSugar</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="secondary"  data-aop="secondary"  data-id="569" data-m='{"i":569,"p":558,"n":"secondary","y":8,"o":4}'>
- <li  data-id="570" data-m='{"i":570,"p":569,"n":"HeadlineItemViewModel","y":13,"l":"BBmxexU","h":0,"v":"health","c":"wellness","o":1}'   class="media photo"   >
-<a href="/en-us/health/wellness/20-little-known-facts-about-being-left-handed/ss-BBmxexU"  >
-<img alt="Southpaws may be more prone to periodic limb movement disorder (&lt;a href=&quot;http://..." data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBmx8Rv.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Provided by health.com" /> <div>
-<h4 >Little-known facts about being left-handed</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB4jqVP.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Health.com</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- 
-</div>
-    </div>
-
-                <div class="paging"></div>
-            </div>
-                <button class="rightarrow"  data-id="571" data-m='{"i":571,"p":548,"n":"rightarrow","y":12,"o":4}'></button>
-            
-        </div>
-    </div>
-    <div  class="stripecontainer"  data-section-id="stripe.video"  data-section-id="stripe.video">
-        <div class="news stripeouter"  data-aop="stripe.video_stripe"  data-id="572" data-m='{"i":572,"p":19,"n":"stripe.video","t":"stripe","o":19}'>
-            
-                <button class="leftarrow"  data-id="573" data-m='{"i":573,"p":572,"n":"leftarrow","y":12,"o":1}'></button>
-            <div class="stripe full-width">
-                
- <div class="stripenav"  data-aop="stripe.video.navigation_stripenavigation"  data-id="574" data-m='{"i":574,"p":572,"n":"stripe.video.navigation","t":"stripeNavigation","o":2}'>
- 
-<ul>
- <li  data-id="575" data-m='{"i":575,"p":574,"n":"video","y":4,"o":1}'><h2><a href="/en-us/video"  data-id="576" data-m='{"i":576,"p":574,"n":"video","y":4,"o":2}'>Video</a></h2></li>
-  <li  class="hide12"  data-id="577" data-m='{"i":577,"p":574,"n":"downtime","y":4,"o":3}'><a href="/en-us/video/downtime">DOWNTIME</a></li>
- <li  class="hide12"  data-id="578" data-m='{"i":578,"p":574,"n":"animals","y":4,"o":4}'><a href="/en-us/video/animals">ANIMALS</a></li>
- <li  class="hide12"  data-id="579" data-m='{"i":579,"p":574,"n":"comedy","y":4,"o":5}'><a href="/en-us/video/comedy">COMEDY</a></li>
- <li  class="hide12"  data-id="580" data-m='{"i":580,"p":574,"n":"popculture","y":4,"o":6}'><a href="/en-us/video/popculture">POP CULTURE</a></li>
- <li  class="hide12"  data-id="581" data-m='{"i":581,"p":574,"n":"peopleandplaces","y":4,"o":7}'><a href="/en-us/video/peopleandplaces">PEOPLE &amp; PLACES</a></li>
- <li  class="hide123"  data-id="582" data-m='{"i":582,"p":574,"n":"wonder","y":4,"o":8}'><a href="/en-us/video/wonder">WONDER</a></li>
- <li  class="hide123"  data-id="583" data-m='{"i":583,"p":574,"n":"news","y":4,"o":9}'><a href="/en-us/video/news">NEWS</a></li>
- <li  class="hide123"  data-id="584" data-m='{"i":584,"p":574,"n":"lifestyle","y":4,"o":10}'><a href="/en-us/video/lifestyle">LIFE &amp; STYLE</a></li>
- </ul>
- <div class="stripemenu">
-<button class="edit"  data-id="585" data-m='{"i":585,"p":574,"n":"personalization","t":"dropdown","o":11}'>Edit</button>
- <button  data-id="586" data-m='{"i":586,"p":574,"n":"remove","t":"dropdownitem","o":12}' class="remove">Remove Section</button>
- <button  data-id="587" data-m='{"i":587,"p":574,"n":"moveup","t":"dropdownitem","o":13}' class="up">Move Section Up</button>
-<button  data-id="588" data-m='{"i":588,"p":574,"n":"movedown","t":"dropdownitem","o":14}' class="down">Move Section Down</button>
- <button  data-id="589" data-m='{"i":589,"p":574,"n":"addbelow","t":"dropdownitem","o":15}' class="add">Add Section Below</button>
- </div>
- 
-</div>
-    <div class="paging-container">
-
- <div  class="stripecontent normaldensity"  data-module-id="startpage|stripe.video|stripe|stripe.video.topstories|headlines"  data-aop="top videos"  data-id="590" data-m='{"i":590,"p":572,"n":"stripe.video.topstories","t":"headlines","o":3}'>
- 
- <ul class="secondary"  data-aop="secondary"  data-id="591" data-m='{"i":591,"p":590,"n":"secondary","y":8,"o":1}'>
- <li  data-id="592" data-m='{"i":592,"p":591,"n":"HeadlineItemViewModel","y":13,"l":"BBn9OwT","h":0,"v":"video","c":"wonder","o":1}'   class="media video"   >
-<a href="/en-us/video/wonder/curiosity-has-apparently-spotted-sculpture-of-a-gods-face-on-mars/vi-BBn9OwT"  >
-<img alt="Curiosity Has Apparently Spotted Sculpture Of A God&#39;s Face On Mars" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9CHv.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=88&amp;y=287&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="AOL" /> <div>
-<h4 >Curiosity Has Apparently Spotted Sculpture Of A God&#39;s Face On Mars</h4>
-
- <span>GeoBeats</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="593" data-m='{"i":593,"p":590,"n":"tertiary","y":8,"o":2}'>
- <li  data-id="594" data-m='{"i":594,"p":593,"n":"HeadlineItemViewModel","y":13,"l":"BBna87z","h":0,"v":"video","c":"animals","o":1}'   class="media video"   >
-<a href="/en-us/video/animals/brown-bear-opens-car-door-with-ease/vi-BBna87z"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9WwD.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=286&amp;y=435&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <div>
-<h4 >Brown Bear opens car door with ease</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA4BKPz.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Rumble</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="595" data-m='{"i":595,"p":593,"n":"HeadlineItemViewModel","y":13,"l":"BBn8jfN","h":0,"v":"video","c":"popculture","o":2}'   class="media video"   >
-<a href="/en-us/video/popculture/few-tears-of-joy-over-oxford-dictionaries-2015-word-of-the-year/vi-BBn8jfN"  >
-<img alt="Few Tears Of Joy Over Oxford Dictionaries&#39; 2015 &#39;Word&#39; Of The Year" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn86tc.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=969&amp;y=265&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Newsy" /> <div>
-<h4 >Few Tears Of Joy Over Oxford Dictionaries&#39; 2015 &#39;Word&#39; Of The Year</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBhb5Hu.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Newsy</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="596" data-m='{"i":596,"p":593,"n":"HeadlineItemViewModel","y":13,"l":"BBn9RDF","h":0,"v":"video","c":"wonder","o":3}'   class="media video"   >
-<a href="/en-us/video/wonder/personal-submarine-helps-you-explore-the-ocean-in-style/vi-BBn9RDF"  >
-<img alt="Personal submarine helps you explore the ocean in style" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn9PQt.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=653&amp;y=502&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Buzz60 Video" /> <div>
-<h4 >Personal submarine helps you explore the ocean in style</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBhFV9y.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Buzz60</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="tertiary"  data-aop="tertiary"  data-id="597" data-m='{"i":597,"p":590,"n":"tertiary","y":8,"o":3}'>
- <li  data-id="598" data-m='{"i":598,"p":597,"n":"HeadlineItemViewModel","y":13,"l":"BBn5FYy","h":0,"v":"video","c":"comedy","o":1}'   class="media video"   >
-<a href="/en-us/video/comedy/cat-cant-get-up/vi-BBn5FYy"  >
-<img alt="Cat Can&#39;t Get Up" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn5FYx.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Fishbowl Worldwide Media" /> <div>
-<h4 >This cat simply can&#39;t get up</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBlL4lL.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Viral Clips Daily</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="599" data-m='{"i":599,"p":597,"n":"HeadlineItemViewModel","y":13,"l":"BBn5OIu","h":0,"v":"video","c":"downtime","o":2}'   class="media video"   >
-<a href="/en-us/video/downtime/on-a-date-guys-vs-girls/vi-BBn5OIu"  >
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn5Wdz.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=771&amp;y=305&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <div>
-<h4 >On A Date: Guys Vs. Girls</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA9UIVl.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>BuzzFeed</span>
-
-                    </div>
-                </a>
-
-            </li>
- <li  data-id="600" data-m='{"i":600,"p":597,"n":"HeadlineItemViewModel","y":13,"l":"BBn8wzp","h":0,"v":"video","c":"animals","o":3}'   class="media video"   >
-<a href="/en-us/video/animals/zoo-penguins-adorable-escape-attempt-goes-viral/vi-BBn8wzp"  >
-<img alt="Zoo Penguins&#39; Adorable Escape Attempt Goes Viral" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn8EiS.img?h=75&amp;w=100&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=147&amp;y=166&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="AOL" /> <div>
-<h4 >Zoo Penguins&#39; Adorable Escape Attempt Goes Viral</h4>
-
- <span>GeoBeats</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- <ul class="secondary"  data-aop="secondary"  data-id="601" data-m='{"i":601,"p":590,"n":"secondary","y":8,"o":4}'>
- <li  data-id="602" data-m='{"i":602,"p":601,"n":"HeadlineItemViewModel","y":13,"l":"BBn6u7G","h":0,"v":"video","c":"lifestyle","o":1}'   class="media video"   >
-<a href="/en-us/video/lifestyle/what-to-wear-on-thanksgiving-to-look-lean-and-eat-big/vi-BBn6u7G"  >
-<img alt="What to wear on Thanksgiving to look lean and eat big" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBn6puA.img?h=194&amp;w=300&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;x=959&amp;y=328&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Buzz60 Video" /> <div>
-<h4 >What to wear on Thanksgiving to look lean and eat big</h4>
-
-<img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BBhFV9y.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" /> <span>Buzz60</span>
-
-                    </div>
-                </a>
-
-            </li>
- </ul>
- 
-</div>
-    </div>
-
-                <div class="paging"></div>
-            </div>
-                <button class="rightarrow"  data-id="603" data-m='{"i":603,"p":572,"n":"rightarrow","y":12,"o":4}'></button>
-            
-        </div>
-    </div>
-
-
- <section id="stripemenuoptions"  data-aop="stripe-personalization">
-<p>Add or Remove a Section</p>
-<button class="close"  data-id="604" data-m='{"i":604,"p":19,"y":12,"l":"stripe_personalization_close","o":20}'>Close</button>
-<div>
- <button  data-stripe-id="stripe.news"  data-id="605" data-m='{"i":605,"p":19,"y":12,"l":"stripe_toggle_stripe.news","o":21}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA4CFdS.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="National News" />
- <span>News</span>
- </button>
- <button  data-stripe-id="stripe.entertainment"  data-id="606" data-m='{"i":606,"p":19,"y":12,"l":"stripe_toggle_stripe.entertainment","o":22}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA5YPIS.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
- <span>Entertainment</span>
- </button>
- <button  data-stripe-id="stripe.sports"  data-id="607" data-m='{"i":607,"p":19,"y":12,"l":"stripe_toggle_stripe.sports","o":23}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA6oQGX.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
- <span>Sports</span>
- </button>
- <button  data-stripe-id="stripe.finance"  data-id="608" data-m='{"i":608,"p":19,"y":12,"l":"stripe_toggle_stripe.finance","o":24}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA4BwSM.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Finance" />
- <span>Money</span>
- </button>
- <button  data-stripe-id="stripe.lifestyle"  data-id="609" data-m='{"i":609,"p":19,"y":12,"l":"stripe_toggle_stripe.lifestyle","o":25}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA6oDps.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
- <span>Lifestyle</span>
- </button>
- <button  data-stripe-id="stripe.autos"  data-id="610" data-m='{"i":610,"p":19,"y":12,"l":"stripe_toggle_stripe.autos","o":26}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA4Ca1l.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Autos" />
- <span>Autos</span>
- </button>
- <button  data-stripe-id="stripe.health"  data-id="611" data-m='{"i":611,"p":19,"y":12,"l":"stripe_toggle_stripe.health","o":27}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA5YKmV.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
- <span>Health &amp; Fitness</span>
- </button>
- <button  data-stripe-id="stripe.foodanddrink"  data-id="612" data-m='{"i":612,"p":19,"y":12,"l":"stripe_toggle_stripe.foodanddrink","o":28}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA5Ypq6.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
- <span>Food &amp; Drink</span>
- </button>
- <button  data-stripe-id="stripe.travel"  data-id="613" data-m='{"i":613,"p":19,"y":12,"l":"stripe_toggle_stripe.travel","o":29}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA4ChN0.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Travel" />
- <span>Travel</span>
- </button>
- <button  data-stripe-id="stripe.photos"  data-id="614" data-m='{"i":614,"p":19,"y":12,"l":"stripe_toggle_stripe.photos","o":30}' >
- 
- <span>Photos</span>
- </button>
- <button  data-stripe-id="stripe.video"  data-id="615" data-m='{"i":615,"p":19,"y":12,"l":"stripe_toggle_stripe.video","o":31}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA6oAOK.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
- <span>Video</span>
- </button>
- <button  data-stripe-id="stripe.movies"  data-id="616" data-m='{"i":616,"p":19,"y":12,"l":"stripe_toggle_stripe.movies","o":32}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA4Cser.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Movies" />
- <span>Movies</span>
- </button>
- <button  data-stripe-id="stripe.tv"  data-id="617" data-m='{"i":617,"p":19,"y":12,"l":"stripe_toggle_stripe.tv","o":33}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA6oL47.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
- <span>TV</span>
- </button>
- <button  data-stripe-id="stripe.music"  data-id="618" data-m='{"i":618,"p":19,"y":12,"l":"stripe_toggle_stripe.music","o":34}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA4Csg8.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Music" />
- <span>Music</span>
- </button>
- <button  data-stripe-id="stripe.world"  data-id="619" data-m='{"i":619,"p":19,"y":12,"l":"stripe_toggle_stripe.world","o":35}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA6olcF.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
- <span>World</span>
- </button>
- <button  data-stripe-id="stripe.national"  data-id="620" data-m='{"i":620,"p":19,"y":12,"l":"stripe_toggle_stripe.national","o":36}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA6oAHY.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
- <span>US</span>
- </button>
- <button  data-stripe-id="stripe.tech"  data-id="621" data-m='{"i":621,"p":19,"y":12,"l":"stripe_toggle_stripe.tech","o":37}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA4Cxu3.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" title="Tech and Science" />
- <span>Technology</span>
- </button>
- <button  data-stripe-id="stripe.politics"  data-id="622" data-m='{"i":622,"p":19,"y":12,"l":"stripe_toggle_stripe.politics","o":38}' >
- <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/AA6oG70.img?h=108&amp;w=145&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
- <span>Politics</span>
- </button>
- <button  data-stripe-id="stripe.holidayshopping"  data-id="623" data-m='{"i":623,"p":19,"y":12,"l":"stripe_toggle_stripe.holidayshopping","o":39}' >
- 
- <span>Holiday Shopping</span>
- </button>
- <div class="loading"></div>
-</div>
-<button class="done"  data-id="624" data-m='{"i":624,"p":19,"y":12,"l":"stripe_personalization_submit","o":40}'>Done</button>
-</section>
-        <script>
-            window._flushTimings && (window._flushTimings.PostContentEnd = new Date - window.performance.timing.navigationStart);
-        </script>
-    </main>
-    <aside id="aside" role="complementary"  data-region="aside"  data-id="625" data-m='{"i":625,"n":"aside","y":6}'>
-        
-        
-        
-    </aside>
-        <script>
-            window._flushTimings && (window._flushTimings.AsideEnd = new Date - window.performance.timing.navigationStart);
-        </script>
-         </div>
-    </div>
-
-
-        <div id="foot">
-            <footer role="contentinfo"  data-region="footer"
-                 data-id="626" data-m='{"i":626,"n":"Footer","y":2}'>
-
-                
-                 <a class="copyright microsoft" href="http://www.microsoft.com/en-us/default.aspx"  data-id="627" data-m='{"i":627,"p":626,"n":"MicrosoftCopyright","y":14,"o":1}'>&#169; 2015 Microsoft</a>
- <ul id="social-plugins"
- data-facebook-like-url="https://www.facebook.com/msn" data-facebook-button-width="14.2rem"  data-twitter-follow-screen-name="msn" data-twitter-button-width="9.5rem" data-twitter-show-screen-name="false" >
- <li id="fbcount"  data-id="628" data-m='{"i":628,"p":626,"n":"facebook","y":11,"o":2}'></li>
-  <li id="twcount"  data-id="629" data-m='{"i":629,"p":626,"n":"twitter","y":11,"o":3}'></li>
- </ul>
- <ul id="links">
- <li><a href="http://go.microsoft.com/fwlink/?LinkId=248688"   data-id="630" data-m='{"i":630,"p":626,"n":"footer_privacy","y":14,"o":4}'
->
-Privacy
-</a>
-</li>
- <li><a href="http://go.microsoft.com/fwlink/?LinkID=246338"   data-id="631" data-m='{"i":631,"p":626,"n":"footer_legal","y":14,"o":5}'
->
-Legal
-</a>
-</li>
- <li><a href="http://go.microsoft.com/fwlink/?LinkID=286759"   data-id="632" data-m='{"i":632,"p":626,"n":"footer_adprivacyinfo","y":14,"o":6}'
->
-About our Ads
-</a>
-</li>
- <li><a href="#"  id="footer_feedback"  data-id="633" data-m='{"i":633,"p":626,"n":"footer_feedback","y":14,"o":7}'>Feedback</a></li>
- <li><a href="http://go.microsoft.com/fwlink/?LinkId=512703"   data-id="634" data-m='{"i":634,"p":626,"n":"footer_help","y":14,"o":8}'
->
-Help
-</a>
-</li>
- <li><a href="/en-us/msn-worldwide"   data-id="635" data-m='{"i":635,"p":626,"n":"footer_worldwide","y":14,"o":9}'
->
-MSN Worldwide
-</a>
-</li>
- <li><a href="http://newsletters.msn.com/"   data-id="636" data-m='{"i":636,"p":626,"n":"footer_newsletter","y":14,"o":10}'
->
-Newsletter
-</a>
-</li>
- <li><a href="https://microsoft.qualtrics.com/SE/?SID=SV_7aLMk2O1NKOhNsx"   data-id="637" data-m='{"i":637,"p":626,"n":"footer_survey","y":14,"o":11}'
- target="_blank">
-Take MSN survey
-</a>
-</li>
- <li><a href="http://advertising.microsoft.com/en"   data-id="638" data-m='{"i":638,"p":626,"n":"footer_advertise","y":14,"o":12}'
->
-Advertise
-</a>
-</li>
- </ul>
-
-                
-            </footer>
-        </div>
-        <script>
-            window._flushTimings && (window._flushTimings.FooterEnd = new Date - window.performance.timing.navigationStart);
-        </script>
-
-<div class="fbpopup-container"  data-aop="fbmsnstartpagelikeprompt">
-<div class="fbpopup">
-<button class="fbpopup-close"  data-id="643" data-m='{"i":643,"n":"main","y":12}'></button>
-<h2>Take a moment to like MSN!</h2>
-<p>Join millions of fans to get the best online content on Facebook</p>
-<div class="fb-page"  data-id="644" data-m='{"i":644,"n":"main","y":12}' data-href=https://www.facebook.com/msn data-width=450 data-hide-cta="true" data-small-header="true" data-hide-cover="true" data-adapt-container-width="false" data-show-facepile=true data-show-posts="false"></div>
-<div class="fbposttext">
-<button id="fbdisablelikeprompt"  data-id="645" data-m='{"i":645,"n":"main","y":12}'>I'm already a fan, don't show this again</button><br />
- <button class="fblink"  data-id="646" data-m='{"i":646,"n":"main","y":12}'>
-<span>Continue to Facebook</span>
-</button>
- </div>
-</div>
-</div>
-
-        <div id="feedback-flyout"  data-aop="feedback_flyout">
-             <button id="feedback-close"  data-id="647" data-m='{"i":647,"n":"feedback","y":11,"l":"close"}'></button>
- <div class="feedbackheader mainheader">
-<h2>Send Feedback</h2>
-<button class="selected"  data-id="648" data-m='{"i":648,"n":"feedback","y":11,"l":"providefeedback"}'>Provide Feedback</button>
-<button id="feedback-reportproblem"  data-id="649" data-m='{"i":649,"n":"feedback","y":11,"l":"reportproblem"}'>Report a Problem</button>
-</div>
- <div class="feedbackheader thankyou">
-<h2>We appreciate your input!</h2>
-</div>
- <div id="feedback-feedbackarea">
-<div class="feedbackarea">
-<label>Select a category:</label>
-<ul>
- <li><p>I&#39;m having problems with Top Destinations</p></li>
- <li><p>I&#39;m having issues searching</p></li>
- <li><p>I&#39;m having problems with Featured Apps</p></li>
- <li><p>I see an error in the content</p></li>
- <li><p>Other</p></li>
- </ul>
-</div>
-<div class="feedbackarea">
-<label for="feedback-inputbox">How we can improve?</label>
-<textarea id="feedback-inputbox" maxlength="400" placeholder="Enter your feedback here. To help protect your privacy, don&#39;t include personal information, like your name or address."></textarea>
-</div>
-</div>
- <div id="feedback-starrating">
- <input id="feedback-file" type="file" name="Upload a Screenshot" accept="image/*" />
- <button id="feedback-upload"  data-id="650" data-m='{"i":650,"n":"feedback","y":11,"l":"upload"}'>
- Upload a Screenshot
-</button>
- <div class="stars">
-<p>Please give an overall site rating:</p>
-<ul data-selected="0">
- <li></li>
- <li></li>
- <li></li>
- <li></li>
- <li></li>
- </ul>
-</div>
-</div>
- <div class="useralias">
-<label for="feedback-useralias">Please enter your alias:</label>
-<input id="feedback-useralias" maxlength="15" />
-</div>
- <button id="feedback-submit" class="footerbutton"  data-id="651" data-m='{"i":651,"n":"feedback","y":11,"l":"submit"}'>Submit</button>
- <a href="http://ampdogfood.msn-int.com/dogfood?ID=2F03E955-9F79-4C56-99E8-63E59743718F&amp;rtb=true&amp;mkt=en-us&amp;AppName=homepage&amp;Version=PrimeWeb-Main_20151116_170005_1174886&amp;curPgURL=http:%2F%2Fwww.msn.com%2F&amp;category=&amp;subcategory=&amp;deviceGroup=tmx.pc.webkit.chrome&amp;buildbranch=e:%5CBuilds%5C1549%5CSources%5CMetroSDK%5CMetroSDKApp%5CMetroSDKApp.csproj&amp;buildconfiguration=Release&amp;machinename=RD00155DE19750&amp;builddate=2015-11-16T17:05:38.0000000%2B00:00&amp;buildversion=2.0.5798.30769&amp;activityId=cc7227b7-f7fe-4e3b-b644-226f3ef2c489" class="footerlink" target="_blank"  data-id="652" data-m='{"i":652,"n":"feedback","y":14,"l":"dogfoodfeedback"}'>File Directly to TFS</a>
- <button id="feedback-ok" class="footerbutton"  data-id="653" data-m='{"i":653,"n":"feedback","y":11,"l":"ok"}'>Close</button>
- <div class="feedbackfooter">
- <div id="feedback-privacy-link">
-<a href="http://go.microsoft.com/fwlink/?LinkId=248688" class="footerlink" target="_blank"  data-id="654" data-m='{"i":654,"n":"feedback","y":14,"l":"feedbackPrivacyLink"}'>Privacy Statement</a>
-</div>
-  <div id="feedback-help-link">
-<a href="https://support.microsoft.com/product/msn/msn" class="footerlink" target="_blank"  data-id="655" data-m='{"i":655,"n":"feedback","y":14,"l":"feedbackHelpLink"}'>Help</a>
-</div>
-  <div id="feedback-help-support-link">
-<a href="http://support.microsoft.com/product/msn/msn" class="footerlink" target="_blank"  data-id="656" data-m='{"i":656,"n":"feedback","y":14,"l":"feedbackHelpSupportLink"}'>Help &amp; Support</a>
-</div>
-  </div>
-
-        </div>
-    <script> _timing.content = +new Date </script>
-<script>require(["window","document","location","trackInfo","c.onload"],function(n,t,i,r){(function u(){var e=r.sitePage,h=e.chartBeatUID,v=e.localeCode,o=e.channel,c=e.department,l=e.chartBeatBase,y=e.chartBeatDomain||i.hostname,p=c?o+","+o+":"+c:o,s,f,a;h&&l?(s=n._timing||{},n._st_startpt=s.start||0,n._st_endpt=s.load||0,f=n.location.pathname,f==="/"||f==="/en-us/"?f="/en-us":f.charAt(f.length-1)=="/"&&(f=f.substr(0,f.length-1)),n._sf_async_config={uid:h,sessionLength:15,domain:v+"."+y,sections:p,authors:e.cvPartner?decodeURIComponent(e.cvPartner.replace("+","%20")):"",path:f},a=(/\bsn:\s*(\w*)/.exec(t.getElementsByTagName("HEAD")[0].getAttribute("data-info"))||{})[1]||"",n._cbq=n._cbq||[],n._cbq.push(["_cdname",a]),require({js:l+"/js/chartbeat.js"})):setTimeout(u,50)})()})</script><script>require(["imageLoad"],function(n){n.cleanup()});define("adLoad",["viewAware","classList","evaluate","mediator","pageTime","document","imgSrc"],function(n,t,i,r,u,f,e){function o(n,t){var i,r;if(n&&n.length)for(i=0;r=n[i];++i)r.nodeType==1&&t(r)}function s(u,f){function y(n){var i,c,h,f;if(n.htmlid==a||n.id==a){if(i=s.offsetHeight,c=s.getAttribute("ad-loaded-height"),c)try{h=parseInt(c);!isNaN(h)&&i<h&&(i=h)}catch(l){return}t.contains(u,"layout-large")!=null?t.remove(u,"layout-large"):t.contains(u,"layout-medium")!=null?t.remove(u,"layout-medium"):t.contains(u,"layout-small")!=null?t.remove(u,"layout-small"):t.contains(u,"layout-none")!=null?t.remove(u,"layout-none"):t.contains(u,"no-ad")!=null&&t.remove(u,"no-ad");i<=2?f="layout-none":v?i>=550?f="layout-large":i>=200?f="layout-medium":i>=50&&(f="layout-small"):i>299?f="layout-large":i>99&&(f="layout-small");f&&(t.add(u,f),o(u.querySelectorAll("img"),function(n){e.checkLoad(n)}),r.pub("invalidate-layout",u),r.pub("truncate"))}}var h,v,l,c,s,a,p;if(u&&u.querySelectorAll&&(f=f||".showcasead,.ad300x250,.ad",h=u.querySelectorAll(f),v=u.className.indexOf("today")>=0,h.length)){if(h.length==1)l=h[0];else switch(n.currentView()){case n.views.SIZE1ROWSIZE4COLUMN:case n.views.SIZE2ROWSIZE4COLUMN:l=h[h.length-1];break;default:l=h[0]}(l.style.display="block",s=l.querySelector(".adcontainer"),s&&(c=i(s.getAttribute("data-adjs"))))&&(a=s.id,v&&(p=s.getAttribute("ad-loaded-height"),p&&y(s)),require(["dap"],function(n){r.sub(n.adLoadedEvent,y);r.sub(n.adRerenderedEvent,y);c.dap&&n(c.dap,c.width,c.height,a,c.iaf,c.option)}))}}var h=f.querySelectorAll(".today1,.todaymodule,.todaystripe,.skyline,.pagingsection .newlist,.tabsection .newlist,.pagingsection .list,.tabsection .list");return o(h,s),{loadSectionAd:s}});require(["jquery","logging","c.deferred"],function(n,t){function i(i){var u=n(this).attr(i);r.test(u)||t.error("[staticsLinkVerifier.js] ver query parameter missing in statics url: "+u)}var r=/[?&]ver=[^&#]/;n("link[href*='_sc/css']").each(function(){i.call(this,"href")});n("script[src*='_sc/js']").each(function(){i.call(this,"src")})});require(["trackInfo","window","c.onload"],function(n,t){function f(){if(n.sitePage.requestId){var r=u.setupParameters("load_time");r.timeToOnload=i;u.sendUpdate(r)}else t.setTimeout(f,500)}var u=n.telemetryTracking,i,r=(t.performance||{}).timing;r&&(i=r.loadEventStart-r.navigationStart,i&&f())});define("c.dom",1);window.onload=function(n){function i(){clearTimeout(t);t=0;define("c.deferred",1)}var t;return function(n){var r;n&&(r=(window.JSON&&window.JSON.parse(n)||{}).dms);t=setTimeout(i,r||3e3)}(document.getElementsByTagName("head")[0].getAttribute("data-js")),function(r){(window._timing||{}).load=+new Date;typeof n=="function"&&n(r);define("c.onload",1);t&&(window.setImmediate?setImmediate(i):setTimeout(i,0))}}(window.onload);require(["jquery","afire","c.dom"],function(n,t){n("body").hasClass("fltssl-keepwarm")&&setInterval(function(){t("https://www.bing.com/partner/primedns.gif?t="+ +new Date)},2e4)})</script><script>define("trackingConstants",{trackingData: {lastIndex: 656 } });</script>    <script> _timing.body = +new Date </script>
-    </body>
-        <!--MSNAvailToken-->
-    </html>
\ No newline at end of file
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/Microsoft.AspNetCore.Razor.Performance.csproj b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/Microsoft.AspNetCore.Razor.Performance.csproj
deleted file mode 100644
index ab0ec8c6fccc..000000000000
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/Microsoft.AspNetCore.Razor.Performance.csproj
+++ /dev/null
@@ -1,40 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <OutputType>Exe</OutputType>
-    <ServerGarbageCollection>true</ServerGarbageCollection>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor.Workspaces\Microsoft.CodeAnalysis.Razor.Workspaces.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\Serialization\*.cs">
-      <Link>Serialization\%(FileName)%(Extension)</Link>
-    </Compile>
-    <Compile Include="..\..\test\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common\TestServices.cs">
-      <Link>TestServices\%(FileName)%(Extension)</Link>
-    </Compile>
-    <Compile Include="..\..\test\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common\TestWorkspace.cs">
-      <Link>TestServices\%(FileName)%(Extension)</Link>
-    </Compile>
-    <Compile Include="..\..\test\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common\TestLanguageServices.cs">
-      <Link>TestServices\%(FileName)%(Extension)</Link>
-    </Compile>
-    <Compile Include="..\..\test\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common\TestWorkspaceServices.cs">
-      <Link>TestServices\%(FileName)%(Extension)</Link>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPackageVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="$(MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/ProjectSystem/BackgroundCodeGenerationBenchmark.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/ProjectSystem/BackgroundCodeGenerationBenchmark.cs
deleted file mode 100644
index 40b903844b07..000000000000
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/ProjectSystem/BackgroundCodeGenerationBenchmark.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using BenchmarkDotNet.Attributes;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.AspNetCore.Razor.Performance
-{
-    public class BackgroundCodeGenerationBenchmark : ProjectSnapshotManagerBenchmarkBase
-    {
-        [IterationSetup]
-        public void Setup()
-        {
-            SnapshotManager = CreateProjectSnapshotManager();
-            SnapshotManager.HostProjectAdded(HostProject);
-            SnapshotManager.Changed += SnapshotManager_Changed;
-        }
-
-        [IterationCleanup]
-        public void Cleanup()
-        {
-            SnapshotManager.Changed -= SnapshotManager_Changed;
-
-            Tasks.Clear();
-        }
-
-        private List<Task> Tasks { get; } = new List<Task>();
-
-        private DefaultProjectSnapshotManager SnapshotManager { get; set; }
-
-        [Benchmark(Description = "Generates the code for 100 files", OperationsPerInvoke = 100)]
-        public async Task BackgroundCodeGeneration_Generate100Files()
-        {
-            for (var i = 0; i < Documents.Length; i++)
-            {
-                SnapshotManager.DocumentAdded(HostProject, Documents[i], TextLoaders[i % 4]);
-            }
-
-            await Task.WhenAll(Tasks);
-        }
-
-        private void SnapshotManager_Changed(object sender, ProjectChangeEventArgs e)
-        {
-            // The real work happens here.
-            var project = SnapshotManager.GetLoadedProject(e.ProjectFilePath);
-            var document = project.GetDocument(e.DocumentFilePath);
-
-            Tasks.Add(document.GetGeneratedOutputAsync());
-        }
-    }
-}
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/ProjectSystem/ProjectLoadBenchmark.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/ProjectSystem/ProjectLoadBenchmark.cs
deleted file mode 100644
index 58baba8faf8b..000000000000
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/ProjectSystem/ProjectLoadBenchmark.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using BenchmarkDotNet.Attributes;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.AspNetCore.Razor.Performance
-{
-    public class ProjectLoadBenchmark : ProjectSnapshotManagerBenchmarkBase
-    {
-        [IterationSetup]
-        public void Setup()
-        {
-            SnapshotManager = CreateProjectSnapshotManager();
-        }
-
-        private DefaultProjectSnapshotManager SnapshotManager { get; set; }
-
-        [Benchmark(Description = "Initializes a project and 100 files", OperationsPerInvoke = 100)]
-        public void ProjectLoad_AddProjectAnd100Files()
-        {
-            SnapshotManager.HostProjectAdded(HostProject);
-
-            for (var i= 0; i < Documents.Length; i++)
-            {
-                SnapshotManager.DocumentAdded(HostProject, Documents[i], TextLoaders[i % 4]);
-            }
-        }
-    }
-}
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/ProjectSystem/ProjectSnapshotManagerBenchmarkBase.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/ProjectSystem/ProjectSnapshotManagerBenchmarkBase.cs
deleted file mode 100644
index 70590a6a35a7..000000000000
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/ProjectSystem/ProjectSnapshotManagerBenchmarkBase.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Razor.Extensions;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.LanguageServices.Razor.Serialization;
-using Newtonsoft.Json;
-
-namespace Microsoft.AspNetCore.Razor.Performance
-{
-    public class ProjectSnapshotManagerBenchmarkBase
-    {
-        public ProjectSnapshotManagerBenchmarkBase()
-        {
-            var current = new DirectoryInfo(AppContext.BaseDirectory);
-            while (current != null && !File.Exists(Path.Combine(current.FullName, "Razor.sln")))
-            {
-                current = current.Parent;
-            }
-
-            var root = current;
-            var projectRoot = Path.Combine(root.FullName, "test", "testapps", "LargeProject");
-
-            HostProject = new HostProject(Path.Combine(projectRoot, "LargeProject.csproj"), FallbackRazorConfiguration.MVC_2_1);
-
-            TextLoaders = new TextLoader[4];
-            for (var i = 0; i < 4; i++)
-            {
-                var filePath = Path.Combine(projectRoot, "Views", "Home", $"View00{i % 4}.cshtml");
-                var text = SourceText.From(filePath, encoding: null);
-                TextLoaders[i] = TextLoader.From(TextAndVersion.Create(text, VersionStamp.Create()));
-            }
-
-            Documents = new HostDocument[100];
-            for (var i = 0; i < Documents.Length; i++)
-            {
-                var filePath = Path.Combine(projectRoot, "Views", "Home", $"View00{i % 4}.cshtml");
-                Documents[i] = new HostDocument(filePath, $"/Views/Home/View00{i}.cshtml");
-            }
-
-            var tagHelpers = Path.Combine(root.FullName, "benchmarks", "Microsoft.AspNetCore.Razor.Performance", "taghelpers.json");
-            TagHelperResolver = new StaticTagHelperResolver(ReadTagHelpers(tagHelpers));
-        }
-
-        internal HostProject HostProject { get; }
-
-        internal HostDocument[] Documents { get; }
-
-        internal TextLoader[] TextLoaders { get; }
-
-        internal TagHelperResolver TagHelperResolver { get; }
-
-        internal DefaultProjectSnapshotManager CreateProjectSnapshotManager()
-        {
-            var services = TestServices.Create(
-                new IWorkspaceService[]
-                {
-                    new StaticProjectSnapshotProjectEngineFactory(),
-                },
-                new ILanguageService[]
-                {
-                    TagHelperResolver,
-                });
-
-            return new DefaultProjectSnapshotManager(
-            new TestForegroundDispatcher(),
-            new TestErrorReporter(),
-            Array.Empty<ProjectSnapshotChangeTrigger>(),
-            new AdhocWorkspace(services));
-        }
-
-        private static IReadOnlyList<TagHelperDescriptor> ReadTagHelpers(string filePath)
-        {
-            var serializer = new JsonSerializer();
-            serializer.Converters.Add(new RazorDiagnosticJsonConverter());
-            serializer.Converters.Add(new TagHelperDescriptorJsonConverter());
-
-            using (var reader = new JsonTextReader(File.OpenText(filePath)))
-            {
-                return serializer.Deserialize<IReadOnlyList<TagHelperDescriptor>>(reader);
-            }
-        }
-
-        private class TestForegroundDispatcher : ForegroundDispatcher
-        {
-            public override bool IsForegroundThread => true;
-
-            public override TaskScheduler ForegroundScheduler => TaskScheduler.Default;
-
-            public override TaskScheduler BackgroundScheduler => TaskScheduler.Default;
-        }
-
-        private class TestErrorReporter : ErrorReporter
-        {
-            public override void ReportError(Exception exception)
-            {
-            }
-
-            public override void ReportError(Exception exception, ProjectSnapshot project)
-            {
-            }
-
-            public override void ReportError(Exception exception, Project workspaceProject)
-            {
-            }
-        }
-
-        private class StaticTagHelperResolver : TagHelperResolver
-        {
-            private readonly IReadOnlyList<TagHelperDescriptor> _tagHelpers;
-
-            public StaticTagHelperResolver(IReadOnlyList<TagHelperDescriptor> tagHelpers)
-            {
-                this._tagHelpers = tagHelpers;
-            }
-
-            public override Task<TagHelperResolutionResult> GetTagHelpersAsync(ProjectSnapshot project, CancellationToken cancellationToken = default)
-            {
-                return Task.FromResult(new TagHelperResolutionResult(_tagHelpers, Array.Empty<RazorDiagnostic>()));
-            }
-        }
-
-        private class StaticProjectSnapshotProjectEngineFactory : ProjectSnapshotProjectEngineFactory
-        {
-            public override RazorProjectEngine Create(ProjectSnapshot project, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
-            {
-                return RazorProjectEngine.Create(project.Configuration, fileSystem, b =>
-                {
-                    RazorExtensions.Register(b);
-                });
-            }
-
-            public override IProjectEngineFactory FindFactory(ProjectSnapshot project)
-            {
-                throw new NotImplementedException();
-            }
-
-            public override IProjectEngineFactory FindSerializableFactory(ProjectSnapshot project)
-            {
-                throw new NotImplementedException();
-            }
-        }
-    }
-}
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/SyntaxTreeGenerationBenckmark.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/SyntaxTreeGenerationBenckmark.cs
deleted file mode 100644
index d1ec9a0a559f..000000000000
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/SyntaxTreeGenerationBenckmark.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Linq;
-using BenchmarkDotNet.Attributes;
-using Microsoft.AspNetCore.Mvc.Razor.Extensions;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.AspNetCore.Razor.Performance
-{
-    public class SyntaxTreeGenerationBenchmark
-    {
-        public SyntaxTreeGenerationBenchmark()
-        {
-            var current = new DirectoryInfo(AppContext.BaseDirectory);
-            while (current != null && !File.Exists(Path.Combine(current.FullName, "MSN.cshtml")))
-            {
-                current = current.Parent;
-            }
-
-            var root = current;
-            var fileSystem = RazorProjectFileSystem.Create(root.FullName);
-
-            ProjectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem, b => RazorExtensions.Register(b)); ;
-
-            var projectItem = fileSystem.GetItem(Path.Combine(root.FullName, "MSN.cshtml"));
-            MSN = RazorSourceDocument.ReadFrom(projectItem);
-
-            var directiveFeature = ProjectEngine.EngineFeatures.OfType<IRazorDirectiveFeature>().FirstOrDefault();
-            Directives = directiveFeature?.Directives.ToArray() ?? Array.Empty<DirectiveDescriptor>();
-        }
-
-        public RazorProjectEngine ProjectEngine { get; }
-
-        public RazorSourceDocument MSN { get; }
-
-        public DirectiveDescriptor[] Directives { get; }
-
-        [Benchmark(Description = "Razor Design Time Syntax Tree Generation of MSN.com")]
-        public void SyntaxTreeGeneration_DesignTime_LargeStaticFile()
-        {
-            var options = RazorParserOptions.CreateDesignTime(o =>
-            {
-                foreach (var directive in Directives)
-                {
-                    o.Directives.Add(directive);
-                }
-            });
-            var syntaxTree = RazorSyntaxTree.Parse(MSN, options);
-
-            if (syntaxTree.Diagnostics.Count != 0)
-            {
-                throw new Exception("Error!" + Environment.NewLine + string.Join(Environment.NewLine, syntaxTree.Diagnostics));
-            }
-        }
-
-        [Benchmark(Description = "Razor Runtime Syntax Tree Generation of MSN.com")]
-        public void SyntaxTreeGeneration_Runtime_LargeStaticFile()
-        {
-            var options = RazorParserOptions.Create(o =>
-            {
-                foreach (var directive in Directives)
-                {
-                    o.Directives.Add(directive);
-                }
-            });
-            var syntaxTree = RazorSyntaxTree.Parse(MSN, options);
-
-            if (syntaxTree.Diagnostics.Count != 0)
-            {
-                throw new Exception("Error!" + Environment.NewLine + string.Join(Environment.NewLine, syntaxTree.Diagnostics));
-            }
-        }
-    }
-}
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/TagHelperSerializationBenchmark.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/TagHelperSerializationBenchmark.cs
deleted file mode 100644
index f1dcabe64092..000000000000
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/TagHelperSerializationBenchmark.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using BenchmarkDotNet.Attributes;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.VisualStudio.LanguageServices.Razor.Serialization;
-using Newtonsoft.Json;
-
-namespace Microsoft.AspNetCore.Razor.Performance
-{
-    public class TagHelperSerializationBenchmark
-    {
-        private readonly byte[] _tagHelperBuffer;
-
-        public TagHelperSerializationBenchmark()
-        {
-            var current = new DirectoryInfo(AppContext.BaseDirectory);
-            while (current != null && !File.Exists(Path.Combine(current.FullName, "taghelpers.json")))
-            {
-                current = current.Parent;
-            }
-
-            var tagHelperFilePath = Path.Combine(current.FullName, "taghelpers.json");
-            _tagHelperBuffer = File.ReadAllBytes(tagHelperFilePath);
-        }
-
-        [Benchmark(Description = "Razor TagHelper Serialization")]
-        public void TagHelper_Serialization_RoundTrip()
-        {
-            var serializer = new JsonSerializer();
-            serializer.Converters.Add(new RazorDiagnosticJsonConverter());
-            serializer.Converters.Add(new TagHelperDescriptorJsonConverter());
-
-            // Deserialize from json file.
-            IReadOnlyList<TagHelperDescriptor> tagHelpers;
-            using (var stream = new MemoryStream(_tagHelperBuffer))
-            using (var reader = new JsonTextReader(new StreamReader(stream)))
-            {
-                tagHelpers = serializer.Deserialize<IReadOnlyList<TagHelperDescriptor>>(reader);
-            }
-
-            // Serialize back to json.
-            using (var stream = new MemoryStream())
-            using (var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: 4096))
-            {
-                serializer.Serialize(writer, tagHelpers);
-            }
-        }
-    }
-}
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/readme.md b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/readme.md
deleted file mode 100644
index 38ce0ff71a02..000000000000
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Compile the solution in Release mode (so binaries are available in release)
-
-To run a specific benchmark add it as parameter.
-```
-dotnet run -c Release <benchmark_name>
-```
-
-If you run without any parameters, you'll be offered the list of all benchmarks and get to choose.
-```
-dotnet run -c Release
-```
\ No newline at end of file
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/taghelpers.json b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/taghelpers.json
deleted file mode 100644
index 27dcb160389e..000000000000
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/taghelpers.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.SpaServices.Prerendering.PrerenderTagHelper","TagMatchingRules":[{"TagName":"*","Attributes":[{"Name":"asp-prerender-module","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-prerender-module","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.SpaServices","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-prerender-module","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.SpaServices.Prerendering.PrerenderTagHelper.ModuleName","Diagnostics":[],"Metadata":{"Common.PropertyName":"ModuleName"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-prerender-export","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.SpaServices.Prerendering.PrerenderTagHelper.ExportName","Diagnostics":[],"Metadata":{"Common.PropertyName":"ExportName"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"asp-prerender-data","IndexerNamePrefix":null,"TypeName":"System.Object","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"object Microsoft.AspNetCore.SpaServices.Prerendering.PrerenderTagHelper.CustomDataParameter","Diagnostics":[],"Metadata":{"Common.PropertyName":"CustomDataParameter"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"asp-prerender-timeout","IndexerNamePrefix":null,"TypeName":"System.Int32","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"int Microsoft.AspNetCore.SpaServices.Prerendering.PrerenderTagHelper.TimeoutMillisecondsParameter","Diagnostics":[],"Metadata":{"Common.PropertyName":"TimeoutMillisecondsParameter"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.SpaServices.Prerendering.PrerenderTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.SpaServices.Prerendering.PrerenderTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper","TagMatchingRules":[{"TagName":"a","Attributes":[{"Name":"asp-action","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-action","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"a","Attributes":[{"Name":"asp-controller","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-controller","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"a","Attributes":[{"Name":"asp-area","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-area","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"a","Attributes":[{"Name":"asp-page","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-page","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"a","Attributes":[{"Name":"asp-page-handler","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-page-handler","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"a","Attributes":[{"Name":"asp-fragment","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-fragment","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"a","Attributes":[{"Name":"asp-host","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-host","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"a","Attributes":[{"Name":"asp-protocol","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-protocol","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"a","Attributes":[{"Name":"asp-route","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-route","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"a","Attributes":[{"Name":"asp-all-route-data","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-all-route-data","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"a","Attributes":[{"Name":"asp-route-","NameComparison":1,"Value":null,"ValueComparison":0,"DisplayName":"asp-route-...","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-action","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper.Action","Diagnostics":[],"Metadata":{"Common.PropertyName":"Action"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-controller","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper.Controller","Diagnostics":[],"Metadata":{"Common.PropertyName":"Controller"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-area","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper.Area","Diagnostics":[],"Metadata":{"Common.PropertyName":"Area"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-page","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper.Page","Diagnostics":[],"Metadata":{"Common.PropertyName":"Page"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-page-handler","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper.PageHandler","Diagnostics":[],"Metadata":{"Common.PropertyName":"PageHandler"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-protocol","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper.Protocol","Diagnostics":[],"Metadata":{"Common.PropertyName":"Protocol"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-host","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper.Host","Diagnostics":[],"Metadata":{"Common.PropertyName":"Host"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-fragment","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper.Fragment","Diagnostics":[],"Metadata":{"Common.PropertyName":"Fragment"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-route","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper.Route","Diagnostics":[],"Metadata":{"Common.PropertyName":"Route"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":true,"IsEnum":false,"IsStringProperty":false,"Name":"asp-all-route-data","IndexerNamePrefix":"asp-route-","TypeName":"System.Collections.Generic.IDictionary<System.String, System.String>","IndexerTypeName":"System.String","HasIndexer":true,"Documentation":null,"DisplayName":"System.Collections.Generic.IDictionary<System.String, System.String> Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper.RouteValues","Diagnostics":[],"Metadata":{"Common.PropertyName":"RouteValues"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper","TagMatchingRules":[{"TagName":"cache","Attributes":[],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"priority","IndexerNamePrefix":null,"TypeName":"Microsoft.Extensions.Caching.Memory.CacheItemPriority?","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"Microsoft.Extensions.Caching.Memory.CacheItemPriority? Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper.Priority","Diagnostics":[],"Metadata":{"Common.PropertyName":"Priority"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"vary-by","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper.VaryBy","Diagnostics":[],"Metadata":{"Common.PropertyName":"VaryBy"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"vary-by-header","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper.VaryByHeader","Diagnostics":[],"Metadata":{"Common.PropertyName":"VaryByHeader"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"vary-by-query","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper.VaryByQuery","Diagnostics":[],"Metadata":{"Common.PropertyName":"VaryByQuery"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"vary-by-route","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper.VaryByRoute","Diagnostics":[],"Metadata":{"Common.PropertyName":"VaryByRoute"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"vary-by-cookie","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper.VaryByCookie","Diagnostics":[],"Metadata":{"Common.PropertyName":"VaryByCookie"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"vary-by-user","IndexerNamePrefix":null,"TypeName":"System.Boolean","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"bool Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper.VaryByUser","Diagnostics":[],"Metadata":{"Common.PropertyName":"VaryByUser"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"expires-on","IndexerNamePrefix":null,"TypeName":"System.DateTimeOffset?","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"System.DateTimeOffset? Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper.ExpiresOn","Diagnostics":[],"Metadata":{"Common.PropertyName":"ExpiresOn"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"expires-after","IndexerNamePrefix":null,"TypeName":"System.TimeSpan?","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"System.TimeSpan? Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper.ExpiresAfter","Diagnostics":[],"Metadata":{"Common.PropertyName":"ExpiresAfter"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"expires-sliding","IndexerNamePrefix":null,"TypeName":"System.TimeSpan?","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"System.TimeSpan? Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper.ExpiresSliding","Diagnostics":[],"Metadata":{"Common.PropertyName":"ExpiresSliding"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"enabled","IndexerNamePrefix":null,"TypeName":"System.Boolean","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"bool Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper.Enabled","Diagnostics":[],"Metadata":{"Common.PropertyName":"Enabled"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper","TagMatchingRules":[{"TagName":"distributed-cache","Attributes":[{"Name":"name","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"name","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"name","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper.Name","Diagnostics":[],"Metadata":{"Common.PropertyName":"Name"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"vary-by","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper.VaryBy","Diagnostics":[],"Metadata":{"Common.PropertyName":"VaryBy"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"vary-by-header","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper.VaryByHeader","Diagnostics":[],"Metadata":{"Common.PropertyName":"VaryByHeader"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"vary-by-query","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper.VaryByQuery","Diagnostics":[],"Metadata":{"Common.PropertyName":"VaryByQuery"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"vary-by-route","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper.VaryByRoute","Diagnostics":[],"Metadata":{"Common.PropertyName":"VaryByRoute"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"vary-by-cookie","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper.VaryByCookie","Diagnostics":[],"Metadata":{"Common.PropertyName":"VaryByCookie"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"vary-by-user","IndexerNamePrefix":null,"TypeName":"System.Boolean","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"bool Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper.VaryByUser","Diagnostics":[],"Metadata":{"Common.PropertyName":"VaryByUser"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"expires-on","IndexerNamePrefix":null,"TypeName":"System.DateTimeOffset?","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"System.DateTimeOffset? Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper.ExpiresOn","Diagnostics":[],"Metadata":{"Common.PropertyName":"ExpiresOn"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"expires-after","IndexerNamePrefix":null,"TypeName":"System.TimeSpan?","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"System.TimeSpan? Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper.ExpiresAfter","Diagnostics":[],"Metadata":{"Common.PropertyName":"ExpiresAfter"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"expires-sliding","IndexerNamePrefix":null,"TypeName":"System.TimeSpan?","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"System.TimeSpan? Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper.ExpiresSliding","Diagnostics":[],"Metadata":{"Common.PropertyName":"ExpiresSliding"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"enabled","IndexerNamePrefix":null,"TypeName":"System.Boolean","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"bool Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper.Enabled","Diagnostics":[],"Metadata":{"Common.PropertyName":"Enabled"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.EnvironmentTagHelper","TagMatchingRules":[{"TagName":"environment","Attributes":[],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"names","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.EnvironmentTagHelper.Names","Diagnostics":[],"Metadata":{"Common.PropertyName":"Names"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"include","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.EnvironmentTagHelper.Include","Diagnostics":[],"Metadata":{"Common.PropertyName":"Include"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"exclude","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.EnvironmentTagHelper.Exclude","Diagnostics":[],"Metadata":{"Common.PropertyName":"Exclude"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.EnvironmentTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.EnvironmentTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.FormActionTagHelper","TagMatchingRules":[{"TagName":"button","Attributes":[{"Name":"asp-action","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-action","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"button","Attributes":[{"Name":"asp-controller","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-controller","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"button","Attributes":[{"Name":"asp-area","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-area","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"button","Attributes":[{"Name":"asp-page","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-page","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"button","Attributes":[{"Name":"asp-page-handler","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-page-handler","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"button","Attributes":[{"Name":"asp-fragment","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-fragment","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"button","Attributes":[{"Name":"asp-route","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-route","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"button","Attributes":[{"Name":"asp-all-route-data","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-all-route-data","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"button","Attributes":[{"Name":"asp-route-","NameComparison":1,"Value":null,"ValueComparison":0,"DisplayName":"asp-route-...","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"image","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-action","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-action","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"image","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-controller","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-controller","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"image","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-area","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-area","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"image","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-page","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-page","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"image","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-page-handler","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-page-handler","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"image","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-fragment","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-fragment","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"image","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-route","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-route","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"image","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-all-route-data","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-all-route-data","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"image","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-route-","NameComparison":1,"Value":null,"ValueComparison":0,"DisplayName":"asp-route-...","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"submit","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-action","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-action","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"submit","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-controller","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-controller","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"submit","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-area","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-area","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"submit","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-page","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-page","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"submit","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-page-handler","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-page-handler","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"submit","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-fragment","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-fragment","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"submit","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-route","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-route","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"submit","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-all-route-data","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-all-route-data","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"type","NameComparison":0,"Value":"submit","ValueComparison":1,"DisplayName":"type","Diagnostics":[],"HasErrors":false},{"Name":"asp-route-","NameComparison":1,"Value":null,"ValueComparison":0,"DisplayName":"asp-route-...","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-action","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormActionTagHelper.Action","Diagnostics":[],"Metadata":{"Common.PropertyName":"Action"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-controller","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormActionTagHelper.Controller","Diagnostics":[],"Metadata":{"Common.PropertyName":"Controller"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-area","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormActionTagHelper.Area","Diagnostics":[],"Metadata":{"Common.PropertyName":"Area"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-page","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormActionTagHelper.Page","Diagnostics":[],"Metadata":{"Common.PropertyName":"Page"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-page-handler","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormActionTagHelper.PageHandler","Diagnostics":[],"Metadata":{"Common.PropertyName":"PageHandler"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-fragment","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormActionTagHelper.Fragment","Diagnostics":[],"Metadata":{"Common.PropertyName":"Fragment"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-route","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormActionTagHelper.Route","Diagnostics":[],"Metadata":{"Common.PropertyName":"Route"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":true,"IsEnum":false,"IsStringProperty":false,"Name":"asp-all-route-data","IndexerNamePrefix":"asp-route-","TypeName":"System.Collections.Generic.IDictionary<System.String, System.String>","IndexerTypeName":"System.String","HasIndexer":true,"Documentation":null,"DisplayName":"System.Collections.Generic.IDictionary<System.String, System.String> Microsoft.AspNetCore.Mvc.TagHelpers.FormActionTagHelper.RouteValues","Diagnostics":[],"Metadata":{"Common.PropertyName":"RouteValues"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.FormActionTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.FormActionTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper","TagMatchingRules":[{"TagName":"form","Attributes":[],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-action","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper.Action","Diagnostics":[],"Metadata":{"Common.PropertyName":"Action"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-controller","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper.Controller","Diagnostics":[],"Metadata":{"Common.PropertyName":"Controller"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-area","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper.Area","Diagnostics":[],"Metadata":{"Common.PropertyName":"Area"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-page","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper.Page","Diagnostics":[],"Metadata":{"Common.PropertyName":"Page"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-page-handler","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper.PageHandler","Diagnostics":[],"Metadata":{"Common.PropertyName":"PageHandler"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"asp-antiforgery","IndexerNamePrefix":null,"TypeName":"System.Boolean?","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"System.Boolean? Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper.Antiforgery","Diagnostics":[],"Metadata":{"Common.PropertyName":"Antiforgery"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-fragment","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper.Fragment","Diagnostics":[],"Metadata":{"Common.PropertyName":"Fragment"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-route","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper.Route","Diagnostics":[],"Metadata":{"Common.PropertyName":"Route"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"method","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper.Method","Diagnostics":[],"Metadata":{"Common.PropertyName":"Method"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":true,"IsEnum":false,"IsStringProperty":false,"Name":"asp-all-route-data","IndexerNamePrefix":"asp-route-","TypeName":"System.Collections.Generic.IDictionary<System.String, System.String>","IndexerTypeName":"System.String","HasIndexer":true,"Documentation":null,"DisplayName":"System.Collections.Generic.IDictionary<System.String, System.String> Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper.RouteValues","Diagnostics":[],"Metadata":{"Common.PropertyName":"RouteValues"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.ImageTagHelper","TagMatchingRules":[{"TagName":"img","Attributes":[{"Name":"asp-append-version","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-append-version","Diagnostics":[],"HasErrors":false},{"Name":"src","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"src","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"src","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.ImageTagHelper.Src","Diagnostics":[],"Metadata":{"Common.PropertyName":"Src"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"asp-append-version","IndexerNamePrefix":null,"TypeName":"System.Boolean","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"bool Microsoft.AspNetCore.Mvc.TagHelpers.ImageTagHelper.AppendVersion","Diagnostics":[],"Metadata":{"Common.PropertyName":"AppendVersion"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.ImageTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.ImageTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.InputTagHelper","TagMatchingRules":[{"TagName":"input","Attributes":[{"Name":"asp-for","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-for","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"asp-for","IndexerNamePrefix":null,"TypeName":"Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression Microsoft.AspNetCore.Mvc.TagHelpers.InputTagHelper.For","Diagnostics":[],"Metadata":{"Common.PropertyName":"For"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-format","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.InputTagHelper.Format","Diagnostics":[],"Metadata":{"Common.PropertyName":"Format"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"type","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.InputTagHelper.InputTypeName","Diagnostics":[],"Metadata":{"Common.PropertyName":"InputTypeName"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"value","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.InputTagHelper.Value","Diagnostics":[],"Metadata":{"Common.PropertyName":"Value"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.InputTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.InputTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.LabelTagHelper","TagMatchingRules":[{"TagName":"label","Attributes":[{"Name":"asp-for","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-for","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"asp-for","IndexerNamePrefix":null,"TypeName":"Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression Microsoft.AspNetCore.Mvc.TagHelpers.LabelTagHelper.For","Diagnostics":[],"Metadata":{"Common.PropertyName":"For"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.LabelTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.LabelTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.LinkTagHelper","TagMatchingRules":[{"TagName":"link","Attributes":[{"Name":"asp-href-include","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-href-include","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"link","Attributes":[{"Name":"asp-href-exclude","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-href-exclude","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"link","Attributes":[{"Name":"asp-fallback-href","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-fallback-href","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"link","Attributes":[{"Name":"asp-fallback-href-include","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-fallback-href-include","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"link","Attributes":[{"Name":"asp-fallback-href-exclude","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-fallback-href-exclude","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"link","Attributes":[{"Name":"asp-fallback-test-class","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-fallback-test-class","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"link","Attributes":[{"Name":"asp-fallback-test-property","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-fallback-test-property","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"link","Attributes":[{"Name":"asp-fallback-test-value","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-fallback-test-value","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"link","Attributes":[{"Name":"asp-append-version","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-append-version","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"href","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.LinkTagHelper.Href","Diagnostics":[],"Metadata":{"Common.PropertyName":"Href"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-href-include","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.LinkTagHelper.HrefInclude","Diagnostics":[],"Metadata":{"Common.PropertyName":"HrefInclude"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-href-exclude","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.LinkTagHelper.HrefExclude","Diagnostics":[],"Metadata":{"Common.PropertyName":"HrefExclude"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-fallback-href","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.LinkTagHelper.FallbackHref","Diagnostics":[],"Metadata":{"Common.PropertyName":"FallbackHref"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"asp-append-version","IndexerNamePrefix":null,"TypeName":"System.Boolean?","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"System.Boolean? Microsoft.AspNetCore.Mvc.TagHelpers.LinkTagHelper.AppendVersion","Diagnostics":[],"Metadata":{"Common.PropertyName":"AppendVersion"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-fallback-href-include","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.LinkTagHelper.FallbackHrefInclude","Diagnostics":[],"Metadata":{"Common.PropertyName":"FallbackHrefInclude"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-fallback-href-exclude","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.LinkTagHelper.FallbackHrefExclude","Diagnostics":[],"Metadata":{"Common.PropertyName":"FallbackHrefExclude"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-fallback-test-class","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.LinkTagHelper.FallbackTestClass","Diagnostics":[],"Metadata":{"Common.PropertyName":"FallbackTestClass"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-fallback-test-property","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.LinkTagHelper.FallbackTestProperty","Diagnostics":[],"Metadata":{"Common.PropertyName":"FallbackTestProperty"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-fallback-test-value","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.LinkTagHelper.FallbackTestValue","Diagnostics":[],"Metadata":{"Common.PropertyName":"FallbackTestValue"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.LinkTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.LinkTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.OptionTagHelper","TagMatchingRules":[{"TagName":"option","Attributes":[],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"value","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.OptionTagHelper.Value","Diagnostics":[],"Metadata":{"Common.PropertyName":"Value"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.OptionTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.OptionTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.RenderAtEndOfFormTagHelper","TagMatchingRules":[{"TagName":"form","Attributes":[],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.RenderAtEndOfFormTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.RenderAtEndOfFormTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper","TagMatchingRules":[{"TagName":"script","Attributes":[{"Name":"asp-src-include","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-src-include","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"script","Attributes":[{"Name":"asp-src-exclude","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-src-exclude","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"script","Attributes":[{"Name":"asp-fallback-src","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-fallback-src","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"script","Attributes":[{"Name":"asp-fallback-src-include","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-fallback-src-include","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"script","Attributes":[{"Name":"asp-fallback-src-exclude","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-fallback-src-exclude","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"script","Attributes":[{"Name":"asp-fallback-test","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-fallback-test","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"script","Attributes":[{"Name":"asp-append-version","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-append-version","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"src","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.Src","Diagnostics":[],"Metadata":{"Common.PropertyName":"Src"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-src-include","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.SrcInclude","Diagnostics":[],"Metadata":{"Common.PropertyName":"SrcInclude"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-src-exclude","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.SrcExclude","Diagnostics":[],"Metadata":{"Common.PropertyName":"SrcExclude"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-fallback-src","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.FallbackSrc","Diagnostics":[],"Metadata":{"Common.PropertyName":"FallbackSrc"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"asp-append-version","IndexerNamePrefix":null,"TypeName":"System.Boolean?","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"System.Boolean? Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.AppendVersion","Diagnostics":[],"Metadata":{"Common.PropertyName":"AppendVersion"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-fallback-src-include","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.FallbackSrcInclude","Diagnostics":[],"Metadata":{"Common.PropertyName":"FallbackSrcInclude"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-fallback-src-exclude","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.FallbackSrcExclude","Diagnostics":[],"Metadata":{"Common.PropertyName":"FallbackSrcExclude"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":true,"Name":"asp-fallback-test","IndexerNamePrefix":null,"TypeName":"System.String","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"string Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.FallbackTestExpression","Diagnostics":[],"Metadata":{"Common.PropertyName":"FallbackTestExpression"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.SelectTagHelper","TagMatchingRules":[{"TagName":"select","Attributes":[{"Name":"asp-for","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-for","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"select","Attributes":[{"Name":"asp-items","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-items","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"asp-for","IndexerNamePrefix":null,"TypeName":"Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression Microsoft.AspNetCore.Mvc.TagHelpers.SelectTagHelper.For","Diagnostics":[],"Metadata":{"Common.PropertyName":"For"},"HasErrors":false},{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"asp-items","IndexerNamePrefix":null,"TypeName":"System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem> Microsoft.AspNetCore.Mvc.TagHelpers.SelectTagHelper.Items","Diagnostics":[],"Metadata":{"Common.PropertyName":"Items"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.SelectTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.SelectTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.TextAreaTagHelper","TagMatchingRules":[{"TagName":"textarea","Attributes":[{"Name":"asp-for","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-for","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"asp-for","IndexerNamePrefix":null,"TypeName":"Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression Microsoft.AspNetCore.Mvc.TagHelpers.TextAreaTagHelper.For","Diagnostics":[],"Metadata":{"Common.PropertyName":"For"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.TextAreaTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.TextAreaTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.ValidationMessageTagHelper","TagMatchingRules":[{"TagName":"span","Attributes":[{"Name":"asp-validation-for","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-validation-for","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":false,"IsStringProperty":false,"Name":"asp-validation-for","IndexerNamePrefix":null,"TypeName":"Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression Microsoft.AspNetCore.Mvc.TagHelpers.ValidationMessageTagHelper.For","Diagnostics":[],"Metadata":{"Common.PropertyName":"For"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.ValidationMessageTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.ValidationMessageTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.TagHelpers.ValidationSummaryTagHelper","TagMatchingRules":[{"TagName":"div","Attributes":[{"Name":"asp-validation-summary","NameComparison":0,"Value":null,"ValueComparison":0,"DisplayName":"asp-validation-summary","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.TagHelpers","BoundAttributes":[{"Kind":"ITagHelper","IsIndexerStringProperty":false,"IsEnum":true,"IsStringProperty":false,"Name":"asp-validation-summary","IndexerNamePrefix":null,"TypeName":"Microsoft.AspNetCore.Mvc.Rendering.ValidationSummary","IndexerTypeName":null,"HasIndexer":false,"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.Rendering.ValidationSummary Microsoft.AspNetCore.Mvc.TagHelpers.ValidationSummaryTagHelper.ValidationSummary","Diagnostics":[],"Metadata":{"Common.PropertyName":"ValidationSummary"},"HasErrors":false}],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.TagHelpers.ValidationSummaryTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.TagHelpers.ValidationSummaryTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper","TagMatchingRules":[{"TagName":"body","Attributes":[],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.Razor","BoundAttributes":[],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper","TagMatchingRules":[{"TagName":"head","Attributes":[],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.Razor","BoundAttributes":[],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper"},"HasErrors":false},{"Kind":"ITagHelper","Name":"Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper","TagMatchingRules":[{"TagName":"*","Attributes":[{"Name":"itemid","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"itemid","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"a","Attributes":[{"Name":"href","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"href","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"applet","Attributes":[{"Name":"archive","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"archive","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"area","Attributes":[{"Name":"href","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"href","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"audio","Attributes":[{"Name":"src","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"src","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"base","Attributes":[{"Name":"href","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"href","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"blockquote","Attributes":[{"Name":"cite","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"cite","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"button","Attributes":[{"Name":"formaction","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"formaction","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"del","Attributes":[{"Name":"cite","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"cite","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"embed","Attributes":[{"Name":"src","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"src","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"form","Attributes":[{"Name":"action","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"action","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"html","Attributes":[{"Name":"manifest","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"manifest","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"iframe","Attributes":[{"Name":"src","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"src","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"img","Attributes":[{"Name":"src","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"src","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"img","Attributes":[{"Name":"srcset","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"srcset","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"src","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"src","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"input","Attributes":[{"Name":"formaction","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"formaction","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"ins","Attributes":[{"Name":"cite","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"cite","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"link","Attributes":[{"Name":"href","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"href","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"menuitem","Attributes":[{"Name":"icon","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"icon","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"object","Attributes":[{"Name":"archive","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"archive","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"object","Attributes":[{"Name":"data","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"data","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"q","Attributes":[{"Name":"cite","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"cite","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"script","Attributes":[{"Name":"src","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"src","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"source","Attributes":[{"Name":"src","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"src","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"source","Attributes":[{"Name":"srcset","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"srcset","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"track","Attributes":[{"Name":"src","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"src","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":2,"Diagnostics":[],"HasErrors":false},{"TagName":"video","Attributes":[{"Name":"src","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"src","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false},{"TagName":"video","Attributes":[{"Name":"poster","NameComparison":0,"Value":"~/","ValueComparison":2,"DisplayName":"poster","Diagnostics":[],"HasErrors":false}],"ParentTag":null,"TagStructure":0,"Diagnostics":[],"HasErrors":false}],"AssemblyName":"Microsoft.AspNetCore.Mvc.Razor","BoundAttributes":[],"AllowedChildTags":[],"Documentation":null,"DisplayName":"Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper","TagOutputHint":null,"Diagnostics":[],"Metadata":{"Runtime.Name":"ITagHelper","Common.TypeName":"Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper"},"HasErrors":false}]
\ No newline at end of file
diff --git a/src/Razor/build.cmd b/src/Razor/build.cmd
new file mode 100644
index 000000000000..f4169ea5e411
--- /dev/null
+++ b/src/Razor/build.cmd
@@ -0,0 +1,3 @@
+@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
new file mode 100644
index 000000000000..d5bb0cf6312d
--- /dev/null
+++ b/src/Razor/build.sh
@@ -0,0 +1,7 @@
+#!/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/repo.targets b/src/Razor/build/repo.targets
index 550069ec4773..5311efc415fd 100644
--- a/src/Razor/build/repo.targets
+++ b/src/Razor/build/repo.targets
@@ -1,7 +1,4 @@
 <Project>
-  <Import Project="VSIX.targets" />
-  <Import Project="MPack.targets" />
-
   <ItemGroup>
     <Solutions Update="$(RepositoryRoot)Razor.sln">
       <!-- the 'DebugNoVSIX' and 'ReleaseNoVSIX' configurations exclude the VSIX project, which doesn't build with Microsoft.NET.Sdk yet. -->
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Properties/AssemblyInfo.cs
index 7214d8bacabc..1a87602ce228 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Properties/AssemblyInfo.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Properties/AssemblyInfo.cs
@@ -2,24 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.GenerateTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Language.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.TagHelperTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Tools.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("rzc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Remote.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.RazorExtension, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Microsoft.AspNetCore.Razor.Tools.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Microsoft.AspNetCore.Razor.Tools.csproj
index e67f36e02f5e..8e48f98549e1 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Microsoft.AspNetCore.Razor.Tools.csproj
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Microsoft.AspNetCore.Razor.Tools.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This assembly contains infrastructure supporting Razor MSBuild integration.</Description>
@@ -12,15 +12,6 @@
     <EnableApiCheck>false</EnableApiCheck>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\Microsoft.VisualStudio.LanguageServices.Razor\Serialization\TagHelperDescriptorJsonConverter.cs">
-      <Link>Shared\TagHelperDescriptorJsonConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\Microsoft.VisualStudio.LanguageServices.Razor\Serialization\RazorDiagnosticJsonConverter.cs">
-      <Link>Shared\RazorDiagnosticJsonConverter.cs</Link>
-    </Compile>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/RazorDiagnosticJsonConverter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Shared/RazorDiagnosticJsonConverter.cs
similarity index 100%
rename from src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/RazorDiagnosticJsonConverter.cs
rename to src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Shared/RazorDiagnosticJsonConverter.cs
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/TagHelperDescriptorJsonConverter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Shared/TagHelperDescriptorJsonConverter.cs
similarity index 100%
rename from src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/TagHelperDescriptorJsonConverter.cs
rename to src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Shared/TagHelperDescriptorJsonConverter.cs
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultErrorReporter.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultErrorReporter.cs
deleted file mode 100644
index ff200966e826..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultErrorReporter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    internal class DefaultErrorReporter : ErrorReporter
-    {
-        public override void ReportError(Exception exception)
-        {
-            if (exception == null)
-            {
-                throw new ArgumentNullException(nameof(exception));
-            }
-
-            // Do nothing.
-        }
-
-        public override void ReportError(Exception exception, ProjectSnapshot project)
-        {
-            if (exception == null)
-            {
-                throw new ArgumentNullException(nameof(exception));
-            }
-
-            // Do nothing.
-        }
-
-        public override void ReportError(Exception exception, Project workspaceProject)
-        {
-            if (exception == null)
-            {
-                throw new ArgumentNullException(nameof(exception));
-            }
-
-            // Do nothing.
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultErrorReporterFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultErrorReporterFactory.cs
deleted file mode 100644
index e9c987d10895..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultErrorReporterFactory.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    [Shared]
-    [ExportWorkspaceServiceFactory(typeof(ErrorReporter), ServiceLayer.Default)]
-    internal class DefaultErrorReporterFactory : IWorkspaceServiceFactory
-    {
-        public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
-        {
-            return new DefaultErrorReporter();
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultProjectSnapshotProjectEngineFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultProjectSnapshotProjectEngineFactory.cs
deleted file mode 100644
index cd9ac1ee5104..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultProjectSnapshotProjectEngineFactory.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    internal class DefaultProjectSnapshotProjectEngineFactory : ProjectSnapshotProjectEngineFactory
-    {
-        private readonly static RazorConfiguration DefaultConfiguration = FallbackRazorConfiguration.MVC_2_1;
-
-        private readonly IFallbackProjectEngineFactory _fallback;
-        private readonly Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>[] _factories;
-
-        public DefaultProjectSnapshotProjectEngineFactory(
-            IFallbackProjectEngineFactory fallback,
-            Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>[] factories)
-        {
-            if (fallback == null)
-            {
-                throw new ArgumentNullException(nameof(fallback));
-            }
-
-            if (factories == null)
-            {
-                throw new ArgumentNullException(nameof(factories));
-            }
-
-            _fallback = fallback;
-            _factories = factories;
-        }
-
-        public override RazorProjectEngine Create(ProjectSnapshot project, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            if (fileSystem == null)
-            {
-                throw new ArgumentNullException(nameof(fileSystem));
-            }
-
-            // When we're running in the editor, the editor provides a configure delegate that will include
-            // the editor settings and tag helpers.
-            // 
-            // This service is only used in process in Visual Studio, and any other callers should provide these
-            // things also.
-            configure = configure ?? ((b) => { });
-
-            // The default configuration currently matches the newest MVC configuration.
-            //
-            // We typically want this because the language adds features over time - we don't want to a bunch of errors
-            // to show up when a document is first opened, and then go away when the configuration loads, we'd prefer the opposite.
-            var configuration = project.Configuration ?? DefaultConfiguration;
-
-            // If there's no factory to handle the configuration then fall back to a very basic configuration.
-            //
-            // This will stop a crash from happening in this case (misconfigured project), but will still make
-            // it obvious to the user that something is wrong.
-            var factory = SelectFactory(configuration) ?? _fallback;
-            return factory.Create(configuration, fileSystem, configure);
-        }
-
-        public override IProjectEngineFactory FindFactory(ProjectSnapshot project)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            return SelectFactory(project.Configuration ?? DefaultConfiguration, requireSerializable: false);
-        }
-
-        public override IProjectEngineFactory FindSerializableFactory(ProjectSnapshot project)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            return SelectFactory(project.Configuration ?? DefaultConfiguration, requireSerializable: true);
-        }
-
-        private IProjectEngineFactory SelectFactory(RazorConfiguration configuration, bool requireSerializable = false)
-        {
-            for (var i = 0; i < _factories.Length; i++)
-            {
-                var factory = _factories[i];
-                if (string.Equals(configuration.ConfigurationName, factory.Metadata.ConfigurationName))
-                {
-                    return requireSerializable && !factory.Metadata.SupportsSerialization ? null : factory.Value;
-                }
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultProjectSnapshotProjectEngineFactoryFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultProjectSnapshotProjectEngineFactoryFactory.cs
deleted file mode 100644
index 663bd8f2bc66..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultProjectSnapshotProjectEngineFactoryFactory.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-
-namespace Microsoft.CodeAnalysis.Razor.Workspaces
-{
-    [ExportWorkspaceServiceFactory(typeof(ProjectSnapshotProjectEngineFactory))]
-    internal class DefaultProjectSnapshotProjectEngineFactoryFactory : IWorkspaceServiceFactory
-    {
-        private readonly IFallbackProjectEngineFactory _fallback;
-        private readonly Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>[] _factories;
-
-        [ImportingConstructor]
-        public DefaultProjectSnapshotProjectEngineFactoryFactory(
-            IFallbackProjectEngineFactory fallback,
-            [ImportMany] Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>[] factories)
-        {
-            if (fallback == null)
-            {
-                throw new ArgumentNullException(nameof(fallback));
-            }
-
-            if (factories == null)
-            {
-                throw new ArgumentNullException(nameof(factories));
-            }
-
-            _fallback = fallback;
-            _factories = factories;
-        }
-
-        public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
-        {
-            if (workspaceServices == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceServices));
-            }
-
-            return new DefaultProjectSnapshotProjectEngineFactory(_fallback, _factories);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentGenerator/BackgroundDocumentGenerator.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentGenerator/BackgroundDocumentGenerator.cs
deleted file mode 100644
index eba3c12e2568..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentGenerator/BackgroundDocumentGenerator.cs
+++ /dev/null
@@ -1,275 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Composition;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.Extensions.Internal;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    // Deliberately not exported for now, until this feature is working end to end.
-    // [Export(typeof(ProjectSnapshotChangeTrigger))]
-    internal class BackgroundDocumentGenerator : ProjectSnapshotChangeTrigger
-    {
-        private ForegroundDispatcher _foregroundDispatcher;
-        private ProjectSnapshotManagerBase _projectManager;
-
-        private readonly Dictionary<DocumentKey, DocumentSnapshot> _files;
-        private Timer _timer;
-
-        [ImportingConstructor]
-        public BackgroundDocumentGenerator(ForegroundDispatcher foregroundDispatcher)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-
-            _files = new Dictionary<DocumentKey, DocumentSnapshot>();
-        }
-
-        public bool HasPendingNotifications
-        {
-            get
-            {
-                lock (_files)
-                {
-                    return _files.Count > 0;
-                }
-            }
-        }
-
-        // Used in unit tests to control the timer delay.
-        public TimeSpan Delay { get; set; } = TimeSpan.FromSeconds(2);
-
-        public bool IsScheduledOrRunning => _timer != null;
-
-        // Used in unit tests to ensure we can control when background work starts.
-        public ManualResetEventSlim BlockBackgroundWorkStart { get; set; }
-
-        // Used in unit tests to ensure we can know when background work finishes.
-        public ManualResetEventSlim NotifyBackgroundWorkStarting { get; set; }
-
-        // Used in unit tests to ensure we can know when background has captured its current workload.
-        public ManualResetEventSlim NotifyBackgroundCapturedWorkload { get; set; }
-
-        // Used in unit tests to ensure we can control when background work completes.
-        public ManualResetEventSlim BlockBackgroundWorkCompleting { get; set; }
-
-        // Used in unit tests to ensure we can know when background work finishes.
-        public ManualResetEventSlim NotifyBackgroundWorkCompleted { get; set; }
-
-        private void OnStartingBackgroundWork()
-        {
-            if (BlockBackgroundWorkStart != null)
-            {
-                BlockBackgroundWorkStart.Wait();
-                BlockBackgroundWorkStart.Reset();
-            }
-
-            if (NotifyBackgroundWorkStarting != null)
-            {
-                NotifyBackgroundWorkStarting.Set();
-            }
-        }
-
-        private void OnCompletingBackgroundWork()
-        {
-            if (BlockBackgroundWorkCompleting != null)
-            {
-                BlockBackgroundWorkCompleting.Wait();
-                BlockBackgroundWorkCompleting.Reset();
-            }
-        }
-
-        private void OnCompletedBackgroundWork()
-        {
-            if (NotifyBackgroundWorkCompleted != null)
-            {
-                NotifyBackgroundWorkCompleted.Set();
-            }
-        }
-
-        private void OnBackgroundCapturedWorkload()
-        {
-            if (NotifyBackgroundCapturedWorkload != null)
-            {
-                NotifyBackgroundCapturedWorkload.Set();
-            }
-        }
-
-        public override void Initialize(ProjectSnapshotManagerBase projectManager)
-        {
-            if (projectManager == null)
-            {
-                throw new ArgumentNullException(nameof(projectManager));
-            }
-
-            _projectManager = projectManager;
-            _projectManager.Changed += ProjectManager_Changed;
-        }
-
-        protected virtual Task ProcessDocument(DocumentSnapshot document)
-        {
-            return document.GetGeneratedOutputAsync();
-        }
-
-        public void Enqueue(ProjectSnapshot project, DocumentSnapshot document)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            if (document == null)
-            {
-                throw new ArgumentNullException(nameof(document));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            lock (_files)
-            {
-                // We only want to store the last 'seen' version of any given document. That way when we pick one to process
-                // it's always the best version to use.
-                _files[new DocumentKey(project.FilePath, document.FilePath)] = document;
-
-                StartWorker();
-            }
-        }
-
-        protected virtual void StartWorker()
-        {
-            // Access to the timer is protected by the lock in Enqueue and in Timer_Tick
-            if (_timer == null)
-            {
-
-                // Timer will fire after a fixed delay, but only once.
-                _timer = NonCapturingTimer.Create(state => ((BackgroundDocumentGenerator)state).Timer_Tick(), this, Delay, Timeout.InfiniteTimeSpan);
-            }
-        }
-
-        private void Timer_Tick()
-        {
-            _ = TimerTick();
-        }
-
-        private async Task TimerTick()
-        {
-            try
-            {
-                _foregroundDispatcher.AssertBackgroundThread();
-
-                // Timer is stopped.
-                _timer.Change(Timeout.Infinite, Timeout.Infinite);
-
-                OnStartingBackgroundWork();
-
-                DocumentSnapshot[] work;
-                lock (_files)
-                {
-                    work = _files.Values.ToArray();
-                    _files.Clear();
-                }
-
-                OnBackgroundCapturedWorkload();
-
-                for (var i = 0; i < work.Length; i++)
-                {
-                    var document = work[i];
-                    try
-                    {
-                        await ProcessDocument(document);
-                    }
-                    catch (Exception ex)
-                    {
-                        ReportError(document, ex);
-                    }
-                }
-
-                OnCompletingBackgroundWork();
-
-                lock (_files)
-                {
-                    // Resetting the timer allows another batch of work to start.
-                    _timer.Dispose();
-                    _timer = null;
-
-                    // If more work came in while we were running start the worker again.
-                    if (_files.Count > 0)
-                    {
-                        StartWorker();
-                    }
-                }
-
-                OnCompletedBackgroundWork();
-            }
-            catch (Exception ex)
-            {
-                // This is something totally unexpected, let's just send it over to the workspace.
-                await Task.Factory.StartNew(
-                    (p) => ((ProjectSnapshotManagerBase)p).ReportError(ex),
-                    _projectManager,
-                    CancellationToken.None,
-                    TaskCreationOptions.None,
-                    _foregroundDispatcher.ForegroundScheduler);
-            }
-        }
-
-        private void ReportError(DocumentSnapshot document, Exception ex)
-        {
-            GC.KeepAlive(Task.Factory.StartNew(
-                (p) => ((ProjectSnapshotManagerBase)p).ReportError(ex), 
-                _projectManager,
-                CancellationToken.None,
-                TaskCreationOptions.None,
-                _foregroundDispatcher.ForegroundScheduler));
-        }
-
-        private void ProjectManager_Changed(object sender, ProjectChangeEventArgs e)
-        {
-            switch (e.Kind)
-            {
-                case ProjectChangeKind.ProjectAdded:
-                case ProjectChangeKind.ProjectChanged:
-                    {
-                        var project = _projectManager.GetLoadedProject(e.ProjectFilePath);
-                        foreach (var documentFilePath in project.DocumentFilePaths)
-                        {
-                            Enqueue(project, project.GetDocument(documentFilePath));
-                        }
-
-                        break;
-                    }
-
-                case ProjectChangeKind.ProjectRemoved:
-                    // ignore
-                    break;
-
-                case ProjectChangeKind.DocumentAdded:
-                case ProjectChangeKind.DocumentChanged:
-                    {
-                        var project = _projectManager.GetLoadedProject(e.ProjectFilePath);
-                        Enqueue(project, project.GetDocument(e.DocumentFilePath));
-
-                        break;
-                    }
-
-                
-                case ProjectChangeKind.DocumentRemoved:
-                    // ignore
-                    break;
-
-                default:
-                    throw new InvalidOperationException($"Unknown ProjectChangeKind {e.Kind}");
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentKey.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentKey.cs
deleted file mode 100644
index 2fe707a7071a..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentKey.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.Extensions.Internal;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    public struct DocumentKey : IEquatable<DocumentKey>
-    {
-        public DocumentKey(string projectFilePath, string documentFilePath)
-        {
-            ProjectFilePath = projectFilePath;
-            DocumentFilePath = documentFilePath;
-        }
-
-        public string ProjectFilePath { get; }
-
-        public string DocumentFilePath { get; }
-
-        public bool Equals(DocumentKey other)
-        {
-            return
-                FilePathComparer.Instance.Equals(ProjectFilePath, other.ProjectFilePath) &&
-                FilePathComparer.Instance.Equals(DocumentFilePath, other.DocumentFilePath);
-        }
-
-        public override bool Equals(object obj)
-        {
-            return obj is DocumentKey key ? Equals(key) : false;
-        }
-
-        public override int GetHashCode()
-        {
-            var hash = new HashCodeCombiner();
-            hash.Add(ProjectFilePath, FilePathComparer.Instance);
-            hash.Add(DocumentFilePath, FilePathComparer.Instance);
-            return hash;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Editor/EditorSettings.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Editor/EditorSettings.cs
deleted file mode 100644
index 113238a878ce..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Editor/EditorSettings.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright(c) .NET Foundation.All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.Extensions.Internal;
-
-namespace Microsoft.CodeAnalysis.Razor.Editor
-{
-    public sealed class EditorSettings : IEquatable<EditorSettings>
-    {
-        public static readonly EditorSettings Default = new EditorSettings(indentWithTabs: false, indentSize: 4);
-
-        public EditorSettings(bool indentWithTabs, int indentSize)
-        {
-            if (indentSize < 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(indentSize));
-            }
-
-            IndentWithTabs = indentWithTabs;
-            IndentSize = indentSize;
-        }
-
-        public bool IndentWithTabs { get; }
-
-        public int IndentSize { get; }
-
-        public bool Equals(EditorSettings other)
-        {
-            if (other == null)
-            {
-                return false;
-            }
-
-            return IndentWithTabs == other.IndentWithTabs &&
-                IndentSize == other.IndentSize;
-        }
-
-        public override bool Equals(object other)
-        {
-            return Equals(other as EditorSettings);
-        }
-
-        public override int GetHashCode()
-        {
-            var combiner = HashCodeCombiner.Start();
-            combiner.Add(IndentWithTabs);
-            combiner.Add(IndentSize);
-
-            return combiner.CombinedHash;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Editor/EditorSettingsChangedEventArgs.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Editor/EditorSettingsChangedEventArgs.cs
deleted file mode 100644
index 573d56654a44..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Editor/EditorSettingsChangedEventArgs.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.CodeAnalysis.Razor.Editor
-{
-    public sealed class EditorSettingsChangedEventArgs : EventArgs
-    {
-        public EditorSettingsChangedEventArgs(EditorSettings settings)
-        {
-            Settings = settings;
-        }
-
-        public EditorSettings Settings { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Editor/WorkspaceEditorSettings.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Editor/WorkspaceEditorSettings.cs
deleted file mode 100644
index 6736dfc39d94..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Editor/WorkspaceEditorSettings.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Host;
-
-namespace Microsoft.CodeAnalysis.Razor.Editor
-{
-    internal abstract class WorkspaceEditorSettings : ILanguageService
-    {
-        public abstract event EventHandler<EditorSettingsChangedEventArgs> Changed;
-
-        public abstract EditorSettings Current { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ErrorReporter.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ErrorReporter.cs
deleted file mode 100644
index 4f0b0dab818e..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ErrorReporter.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    internal abstract class ErrorReporter : IWorkspaceService
-    {
-        public abstract void ReportError(Exception exception);
-        
-        public abstract void ReportError(Exception exception, ProjectSnapshot project);
-
-        public abstract void ReportError(Exception exception, Project workspaceProject);
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ExportCustomProjectEngineFactoryAttribute.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ExportCustomProjectEngineFactoryAttribute.cs
deleted file mode 100644
index 923cb0a66ec3..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ExportCustomProjectEngineFactoryAttribute.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    [MetadataAttribute]
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
-    public class ExportCustomProjectEngineFactoryAttribute : ExportAttribute, ICustomProjectEngineFactoryMetadata
-    {
-        public ExportCustomProjectEngineFactoryAttribute(string configurationName)
-            : base(typeof(IProjectEngineFactory))
-        {
-            if (configurationName == null)
-            {
-                throw new ArgumentNullException(nameof(configurationName));
-            }
-
-            ConfigurationName = configurationName;
-        }
-
-        public string ConfigurationName { get; }
-
-        public bool SupportsSerialization { get; set; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/FallbackProjectEngineFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/FallbackProjectEngineFactory.cs
deleted file mode 100644
index 855acedde25c..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/FallbackProjectEngineFactory.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    [Export(typeof(IFallbackProjectEngineFactory))]
-    internal class FallbackProjectEngineFactory : IFallbackProjectEngineFactory
-    {
-        public RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
-        {
-            if (configuration == null)
-            {
-                throw new ArgumentNullException(nameof(configuration));
-            }
-
-            if (fileSystem == null)
-            {
-                throw new ArgumentNullException(nameof(fileSystem));
-            }
-
-            // This is a very basic implementation that will provide reasonable support without crashing.
-            // If the user falls into this situation, ideally they can realize that something is wrong and take
-            // action.
-            //
-            // This has no support for:
-            // - Tag Helpers
-            // - Imports
-            // - Default Imports
-            // - and will have a very limited set of directives
-            return RazorProjectEngine.Create(configuration, fileSystem, configure);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ForegroundDispatcher.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ForegroundDispatcher.cs
deleted file mode 100644
index bf9b0f59a49c..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ForegroundDispatcher.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Host;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    internal abstract class ForegroundDispatcher
-    {
-        public abstract bool IsForegroundThread { get; }
-
-        public abstract TaskScheduler ForegroundScheduler { get; }
-
-        public abstract TaskScheduler BackgroundScheduler { get; }
-
-        public virtual void AssertForegroundThread([CallerMemberName] string caller = null)
-        {
-            if (!IsForegroundThread)
-            {
-                caller = caller == null ? Workspaces.Resources.ForegroundDispatcher_NoMethodNamePlaceholder : $"'{caller}'";
-                throw new InvalidOperationException(Workspaces.Resources.FormatForegroundDispatcher_AssertForegroundThread(caller));
-            }
-        }
-
-        public virtual void AssertBackgroundThread([CallerMemberName] string caller = null)
-        {
-            if (IsForegroundThread)
-            {
-                caller = caller == null ? Workspaces.Resources.ForegroundDispatcher_NoMethodNamePlaceholder : $"'{caller}'";
-                throw new InvalidOperationException(Workspaces.Resources.FormatForegroundDispatcher_AssertBackgroundThread(caller));
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ICustomProjectEngineFactoryMetadata.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ICustomProjectEngineFactoryMetadata.cs
deleted file mode 100644
index 3f93a6e60523..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ICustomProjectEngineFactoryMetadata.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    public interface ICustomProjectEngineFactoryMetadata
-    {
-        string ConfigurationName { get; }
-
-        bool SupportsSerialization { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/IFallbackProjectEngineFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/IFallbackProjectEngineFactory.cs
deleted file mode 100644
index ccdc1b80c16c..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/IFallbackProjectEngineFactory.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    // Used to create the 'fallback' project engine when we don't have a custom implementation.
-    internal interface IFallbackProjectEngineFactory : IProjectEngineFactory
-    {
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/IProjectEngineFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/IProjectEngineFactory.cs
deleted file mode 100644
index 903c47842b21..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/IProjectEngineFactory.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    public interface IProjectEngineFactory
-    {
-        RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure);
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj
deleted file mode 100644
index ca09c13e7865..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure.</Description>
-    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
-    <EnableApiCheck>false</EnableApiCheck>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(VSIX_MicrosoftCodeAnalysisCSharpPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.NonCapturingTimer.Sources" Version="$(MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion)" PrivateAssets="all" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSnapshotProjectEngineFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSnapshotProjectEngineFactory.cs
deleted file mode 100644
index cf2341878dfd..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSnapshotProjectEngineFactory.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    internal abstract class ProjectSnapshotProjectEngineFactory : IWorkspaceService
-    {
-        public abstract IProjectEngineFactory FindFactory(ProjectSnapshot project);
-
-        public abstract IProjectEngineFactory FindSerializableFactory(ProjectSnapshot project);
-
-        public RazorProjectEngine Create(ProjectSnapshot project)
-        {
-            return Create(project, RazorProjectFileSystem.Create(Path.GetDirectoryName(project.FilePath)), null);
-        }
-
-        public RazorProjectEngine Create(ProjectSnapshot project, RazorProjectFileSystem fileSystem)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            if (fileSystem == null)
-            {
-                throw new ArgumentNullException(nameof(fileSystem));
-            }
-
-            return Create(project, fileSystem, null);
-        }
-
-        public RazorProjectEngine Create(ProjectSnapshot project, Action<RazorProjectEngineBuilder> configure)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            return Create(project, RazorProjectFileSystem.Create(Path.GetDirectoryName(project.FilePath)), configure);
-        }
-
-        public abstract RazorProjectEngine Create(ProjectSnapshot project, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure);
-
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultDocumentSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultDocumentSnapshot.cs
deleted file mode 100644
index d25b38ddbe45..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultDocumentSnapshot.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class DefaultDocumentSnapshot : DocumentSnapshot
-    {
-        public DefaultDocumentSnapshot(DefaultProjectSnapshot project, DocumentState state)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            if (state == null)
-            {
-                throw new ArgumentNullException(nameof(state));
-            }
-
-            Project = project;
-            State = state;
-        }
-
-        public DefaultProjectSnapshot Project { get; }
-
-        public DocumentState State { get; }
-
-        public override string FilePath => State.HostDocument.FilePath;
-
-        public override string TargetPath => State.HostDocument.TargetPath;
-
-        public override IReadOnlyList<DocumentSnapshot> GetImports()
-        {
-            return State.Imports.GetImports(Project, this);
-        }
-
-        public override Task<SourceText> GetTextAsync()
-        {
-            return State.GetTextAsync();
-        }
-
-        public override Task<VersionStamp> GetTextVersionAsync()
-        {
-            return State.GetTextVersionAsync();
-        }
-
-        public override Task<RazorCodeDocument> GetGeneratedOutputAsync()
-        {
-            // IMPORTANT: Don't put more code here. We want this to return a cached task.
-            return State.GeneratedOutput.GetGeneratedOutputInitializationTask(Project, this);
-        }
-
-        public override bool TryGetText(out SourceText result)
-        {
-            return State.TryGetText(out result);
-        }
-
-        public override bool TryGetTextVersion(out VersionStamp result)
-        {
-            return State.TryGetTextVersion(out result);
-        }
-
-        public override bool TryGetGeneratedOutput(out RazorCodeDocument result)
-        {
-            if (State.GeneratedOutput.IsResultAvailable)
-            {
-                result = State.GeneratedOutput.GetGeneratedOutputInitializationTask(Project, this).Result;
-                return true;
-            }
-
-            result = null;
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshot.cs
deleted file mode 100644
index aba5e7a9163e..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshot.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class DefaultProjectSnapshot : ProjectSnapshot
-    {
-        private readonly object _lock;
-
-        private Dictionary<string, DefaultDocumentSnapshot> _documents;
-
-        public DefaultProjectSnapshot(ProjectState state)
-        {
-            if (state == null)
-            {
-                throw new ArgumentNullException(nameof(state));
-            }
-
-            State = state;
-
-            _lock = new object();
-            _documents = new Dictionary<string, DefaultDocumentSnapshot>(FilePathComparer.Instance);
-        }
-
-        public ProjectState State { get; }
-
-        public override RazorConfiguration Configuration => HostProject.Configuration;
-
-        public override IEnumerable<string> DocumentFilePaths => State.Documents.Keys;
-
-        public override string FilePath => State.HostProject.FilePath;
-
-        public HostProject HostProject => State.HostProject;
-
-        public override bool IsInitialized => WorkspaceProject != null;
-
-        public override VersionStamp Version => State.Version;
-
-        public override Project WorkspaceProject => State.WorkspaceProject;
-
-        public override DocumentSnapshot GetDocument(string filePath)
-        {
-            lock (_lock)
-            {
-                if (!_documents.TryGetValue(filePath, out var result) && 
-                    State.Documents.TryGetValue(filePath, out var state))
-                {
-                    result = new DefaultDocumentSnapshot(this, state);
-                    _documents.Add(filePath, result);
-                }
-
-                return result;
-            }
-        }
-
-        public override RazorProjectEngine GetProjectEngine()
-        {
-            return State.ProjectEngine.GetProjectEngine(this);
-        }
-
-        public override Task<IReadOnlyList<TagHelperDescriptor>> GetTagHelpersAsync()
-        {
-            // IMPORTANT: Don't put more code here. We want this to return a cached task.
-            return State.TagHelpers.GetTagHelperInitializationTask(this);
-        }
-
-        public override bool TryGetTagHelpers(out IReadOnlyList<TagHelperDescriptor> result)
-        {
-            if (State.TagHelpers.IsResultAvailable)
-            {
-                result = State.TagHelpers.GetTagHelperInitializationTask(this).Result;
-                return true;
-            }
-
-            result = null;
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshotManager.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshotManager.cs
deleted file mode 100644
index 5a810cc80396..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshotManager.cs
+++ /dev/null
@@ -1,656 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    // The implementation of project snapshot manager abstracts over the Roslyn Project (WorkspaceProject)
-    // and information from the host's underlying project system (HostProject), to provide a unified and
-    // immutable view of the underlying project systems.
-    //
-    // The HostProject support all of the configuration that the Razor SDK exposes via the project system
-    // (language version, extensions, named configuration).
-    //
-    // The WorkspaceProject is needed to support our use of Roslyn Compilations for Tag Helpers and other
-    // C# based constructs.
-    //
-    // The implementation will create a ProjectSnapshot for each HostProject. Put another way, when we
-    // see a WorkspaceProject get created, we only care if we already have a HostProject for the same
-    // filepath.
-    //
-    // Our underlying HostProject infrastructure currently does not handle multiple TFMs (project with
-    // $(TargetFrameworks), so we just bind to the first WorkspaceProject we see for each HostProject.
-    internal class DefaultProjectSnapshotManager : ProjectSnapshotManagerBase
-    {
-        public override event EventHandler<ProjectChangeEventArgs> Changed;
-
-        private readonly ErrorReporter _errorReporter;
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly ProjectSnapshotChangeTrigger[] _triggers;
-
-        // Each entry holds a ProjectState and an optional ProjectSnapshot. ProjectSnapshots are
-        // created lazily.
-        private readonly Dictionary<string, Entry> _projects;
-        private readonly HashSet<string> _openDocuments;
-
-        public DefaultProjectSnapshotManager(
-            ForegroundDispatcher foregroundDispatcher,
-            ErrorReporter errorReporter,
-            IEnumerable<ProjectSnapshotChangeTrigger> triggers,
-            Workspace workspace)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (errorReporter == null)
-            {
-                throw new ArgumentNullException(nameof(errorReporter));
-            }
-
-            if (triggers == null)
-            {
-                throw new ArgumentNullException(nameof(triggers));
-            }
-
-            if (workspace == null)
-            {
-                throw new ArgumentNullException(nameof(workspace));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _errorReporter = errorReporter;
-            _triggers = triggers.ToArray();
-            Workspace = workspace;
-
-            _projects = new Dictionary<string, Entry>(FilePathComparer.Instance);
-            _openDocuments = new HashSet<string>(FilePathComparer.Instance);
-
-            for (var i = 0; i < _triggers.Length; i++)
-            {
-                _triggers[i].Initialize(this);
-            }
-        }
-
-        public override IReadOnlyList<ProjectSnapshot> Projects
-        {
-            get
-            {
-                _foregroundDispatcher.AssertForegroundThread();
-
-
-                var i = 0;
-                var projects = new ProjectSnapshot[_projects.Count];
-                foreach (var entry in _projects)
-                {
-                    if (entry.Value.Snapshot == null)
-                    {
-                        entry.Value.Snapshot = new DefaultProjectSnapshot(entry.Value.State);
-                    }
-
-                    projects[i++] = entry.Value.Snapshot;
-                }
-
-                return projects;
-            }
-        }
-
-        public override Workspace Workspace { get; }
-
-        public override ProjectSnapshot GetLoadedProject(string filePath)
-        {
-            if (filePath == null)
-            {
-                throw new ArgumentNullException(nameof(filePath));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (_projects.TryGetValue(filePath, out var entry))
-            {
-                if (entry.Snapshot == null)
-                {
-                    entry.Snapshot = new DefaultProjectSnapshot(entry.State);
-                }
-
-                return entry.Snapshot;
-            }
-
-            return null;
-        }
-
-        public override ProjectSnapshot GetOrCreateProject(string filePath)
-        {
-            if (filePath == null)
-            {
-                throw new ArgumentNullException(nameof(filePath));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            return GetLoadedProject(filePath) ?? new EphemeralProjectSnapshot(Workspace.Services, filePath);
-        }
-
-        public override bool IsDocumentOpen(string documentFilePath)
-        {
-            if (documentFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(documentFilePath));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            return _openDocuments.Contains(documentFilePath);
-        }
-
-        public override void DocumentAdded(HostProject hostProject, HostDocument document, TextLoader textLoader)
-        {
-            if (hostProject == null)
-            {
-                throw new ArgumentNullException(nameof(hostProject));
-            }
-
-            if (document == null)
-            {
-                throw new ArgumentNullException(nameof(document));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (_projects.TryGetValue(hostProject.FilePath, out var entry))
-            {
-                var loader = textLoader == null ? DocumentState.EmptyLoader : (Func<Task<TextAndVersion>>)(() =>
-                {
-                    return textLoader.LoadTextAndVersionAsync(Workspace, null, CancellationToken.None);
-                });
-                var state = entry.State.WithAddedHostDocument(document, loader);
-
-                // Document updates can no-op.
-                if (!object.ReferenceEquals(state, entry.State))
-                {
-                    _projects[hostProject.FilePath] = new Entry(state);
-                    NotifyListeners(new ProjectChangeEventArgs(hostProject.FilePath, document.FilePath, ProjectChangeKind.DocumentAdded));
-                }
-            }
-        }
-
-        public override void DocumentRemoved(HostProject hostProject, HostDocument document)
-        {
-            if (hostProject == null)
-            {
-                throw new ArgumentNullException(nameof(hostProject));
-            }
-
-            if (document == null)
-            {
-                throw new ArgumentNullException(nameof(document));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-            if (_projects.TryGetValue(hostProject.FilePath, out var entry))
-            {
-                var state = entry.State.WithRemovedHostDocument(document);
-
-                // Document updates can no-op.
-                if (!object.ReferenceEquals(state, entry.State))
-                {
-                    _projects[hostProject.FilePath] = new Entry(state);
-                    NotifyListeners(new ProjectChangeEventArgs(hostProject.FilePath, document.FilePath, ProjectChangeKind.DocumentRemoved));
-                }
-            }
-        }
-
-        public override void DocumentOpened(string projectFilePath, string documentFilePath, SourceText sourceText)
-        {
-            if (projectFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(projectFilePath));
-            }
-
-            if (documentFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(documentFilePath));
-            }
-
-            if (sourceText == null)
-            {
-                throw new ArgumentNullException(nameof(sourceText));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-            if (_projects.TryGetValue(projectFilePath, out var entry) &&
-                entry.State.Documents.TryGetValue(documentFilePath, out var older))
-            {
-                ProjectState state;
-                SourceText olderText;
-                VersionStamp olderVersion;
-
-                var currentText = sourceText;
-                if (older.TryGetText(out olderText) && 
-                    older.TryGetTextVersion(out olderVersion))
-                {
-                    var version = currentText.ContentEquals(olderText) ? olderVersion : olderVersion.GetNewerVersion();
-                    state = entry.State.WithChangedHostDocument(older.HostDocument, currentText, version);
-                }
-                else
-                {
-                    state = entry.State.WithChangedHostDocument(older.HostDocument, async () =>
-                    {
-                        olderText = await older.GetTextAsync().ConfigureAwait(false);
-                        olderVersion = await older.GetTextVersionAsync().ConfigureAwait(false);
-
-                        var version = currentText.ContentEquals(olderText) ? olderVersion : olderVersion.GetNewerVersion();
-                        return TextAndVersion.Create(currentText, version, documentFilePath);
-                    });
-                }
-
-                _openDocuments.Add(documentFilePath);
-
-                // Document updates can no-op.
-                if (!object.ReferenceEquals(state, entry.State))
-                {
-                    _projects[projectFilePath] = new Entry(state);
-                    NotifyListeners(new ProjectChangeEventArgs(projectFilePath, documentFilePath, ProjectChangeKind.DocumentChanged));
-                }
-            }
-        }
-
-        public override void DocumentClosed(string projectFilePath, string documentFilePath, TextLoader textLoader)
-        {
-            if (projectFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(projectFilePath));
-            }
-
-            if (documentFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(documentFilePath));
-            }
-
-            if (textLoader == null)
-            {
-                throw new ArgumentNullException(nameof(textLoader));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-            if (_projects.TryGetValue(projectFilePath, out var entry) &&
-                entry.State.Documents.TryGetValue(documentFilePath, out var older))
-            {
-                var state = entry.State.WithChangedHostDocument(older.HostDocument, async () =>
-                {
-                    return await textLoader.LoadTextAndVersionAsync(Workspace, default, default);
-                });
-
-                _openDocuments.Remove(documentFilePath);
-
-                // Document updates can no-op.
-                if (!object.ReferenceEquals(state, entry.State))
-                {
-                    _projects[projectFilePath] = new Entry(state);
-                    NotifyListeners(new ProjectChangeEventArgs(projectFilePath, documentFilePath, ProjectChangeKind.DocumentChanged));
-                }
-            }
-        }
-
-        public override void DocumentChanged(string projectFilePath, string documentFilePath, SourceText sourceText)
-        {
-            if (projectFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(projectFilePath));
-            }
-
-            if (documentFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(documentFilePath));
-            }
-
-            if (sourceText == null)
-            {
-                throw new ArgumentNullException(nameof(sourceText));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-            if (_projects.TryGetValue(projectFilePath, out var entry) &&
-                entry.State.Documents.TryGetValue(documentFilePath, out var older))
-            {
-                ProjectState state;
-                SourceText olderText;
-                VersionStamp olderVersion;
-
-                var currentText = sourceText;
-                if (older.TryGetText(out olderText) &&
-                    older.TryGetTextVersion(out olderVersion))
-                {
-                    var version = currentText.ContentEquals(olderText) ? olderVersion : olderVersion.GetNewerVersion();
-                    state = entry.State.WithChangedHostDocument(older.HostDocument, currentText, version);
-                }
-                else
-                {
-                    state = entry.State.WithChangedHostDocument(older.HostDocument, async () =>
-                    {
-                        olderText = await older.GetTextAsync().ConfigureAwait(false);
-                        olderVersion = await older.GetTextVersionAsync().ConfigureAwait(false);
-
-                        var version = currentText.ContentEquals(olderText) ? olderVersion : olderVersion.GetNewerVersion();
-                        return TextAndVersion.Create(currentText, version, documentFilePath);
-                    });
-                }
-
-                // Document updates can no-op.
-                if (!object.ReferenceEquals(state, entry.State))
-                {
-                    _projects[projectFilePath] = new Entry(state);
-                    NotifyListeners(new ProjectChangeEventArgs(projectFilePath, documentFilePath, ProjectChangeKind.DocumentChanged));
-                }
-            }
-        }
-
-        public override void DocumentChanged(string projectFilePath, string documentFilePath, TextLoader textLoader)
-        {
-            if (projectFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(projectFilePath));
-            }
-
-            if (documentFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(documentFilePath));
-            }
-
-            if (textLoader == null)
-            {
-                throw new ArgumentNullException(nameof(textLoader));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-            if (_projects.TryGetValue(projectFilePath, out var entry) &&
-                entry.State.Documents.TryGetValue(documentFilePath, out var older))
-            {
-                var state = entry.State.WithChangedHostDocument(older.HostDocument, async () =>
-                {
-                    return await textLoader.LoadTextAndVersionAsync(Workspace, default, default);
-                });
-
-                // Document updates can no-op.
-                if (!object.ReferenceEquals(state, entry.State))
-                {
-                    _projects[projectFilePath] = new Entry(state);
-                    NotifyListeners(new ProjectChangeEventArgs(projectFilePath, documentFilePath, ProjectChangeKind.DocumentChanged));
-                }
-            }
-        }
-
-        public override void HostProjectAdded(HostProject hostProject)
-        {
-            if (hostProject == null)
-            {
-                throw new ArgumentNullException(nameof(hostProject));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            // We don't expect to see a HostProject initialized multiple times for the same path. Just ignore it.
-            if (_projects.ContainsKey(hostProject.FilePath))
-            {
-                return;
-            }
-
-            // It's possible that Workspace has already created a project for this, but it's not deterministic
-            // So if possible find a WorkspaceProject.
-            var workspaceProject = GetWorkspaceProject(hostProject.FilePath);
-
-            var state = ProjectState.Create(Workspace.Services, hostProject, workspaceProject);
-            _projects[hostProject.FilePath] = new Entry(state);
-
-            // We need to notify listeners about every project add.
-            NotifyListeners(new ProjectChangeEventArgs(hostProject.FilePath, ProjectChangeKind.ProjectAdded));
-        }
-
-        public override void HostProjectChanged(HostProject hostProject)
-        {
-            if (hostProject == null)
-            {
-                throw new ArgumentNullException(nameof(hostProject));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (_projects.TryGetValue(hostProject.FilePath, out var entry))
-            {
-                var state = entry.State.WithHostProject(hostProject);
-
-                // HostProject updates can no-op.
-                if (!object.ReferenceEquals(state, entry.State))
-                {
-                    _projects[hostProject.FilePath] = new Entry(state);
-
-                    NotifyListeners(new ProjectChangeEventArgs(hostProject.FilePath, ProjectChangeKind.ProjectChanged));
-                }
-            }
-        }
-
-        public override void HostProjectRemoved(HostProject hostProject)
-        {
-            if (hostProject == null)
-            {
-                throw new ArgumentNullException(nameof(hostProject));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (_projects.TryGetValue(hostProject.FilePath, out var snapshot))
-            {
-                _projects.Remove(hostProject.FilePath);
-
-                // We need to notify listeners about every project removal.
-                NotifyListeners(new ProjectChangeEventArgs(hostProject.FilePath, ProjectChangeKind.ProjectRemoved));
-            }
-        }
-
-        public override void WorkspaceProjectAdded(Project workspaceProject)
-        {
-            if (workspaceProject == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceProject));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (!IsSupportedWorkspaceProject(workspaceProject))
-            {
-                return;
-            }
-
-            // The WorkspaceProject initialization never triggers a "Project Add" from out point of view, we
-            // only care if the new WorkspaceProject matches an existing HostProject.
-            if (_projects.TryGetValue(workspaceProject.FilePath, out var entry))
-            {
-                // If this is a multi-targeting project then we are only interested in a single workspace project. If we already
-                // found one in the past just ignore this one.
-                if (entry.State.WorkspaceProject == null)
-                {
-                    var state = entry.State.WithWorkspaceProject(workspaceProject);
-                    _projects[workspaceProject.FilePath] = new Entry(state);
-
-                    NotifyListeners(new ProjectChangeEventArgs(workspaceProject.FilePath, ProjectChangeKind.ProjectChanged));
-                }
-            }
-        }
-
-        public override void WorkspaceProjectChanged(Project workspaceProject)
-        {
-            if (workspaceProject == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceProject));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (!IsSupportedWorkspaceProject(workspaceProject))
-            {
-                return;
-            }
-
-            // We also need to check the projectId here. If this is a multi-targeting project then we are only interested
-            // in a single workspace project. Just use the one that showed up first.
-            if (_projects.TryGetValue(workspaceProject.FilePath, out var entry) &&
-                (entry.State.WorkspaceProject == null || entry.State.WorkspaceProject.Id == workspaceProject.Id) &&
-                (entry.State.WorkspaceProject == null || entry.State.WorkspaceProject.Version.GetNewerVersion(workspaceProject.Version) == workspaceProject.Version))
-            {
-                var state = entry.State.WithWorkspaceProject(workspaceProject);
-                
-                // WorkspaceProject updates can no-op. This can be the case if a build is triggered, but we've
-                // already seen the update.
-                if (!object.ReferenceEquals(state, entry.State))
-                {
-                    _projects[workspaceProject.FilePath] = new Entry(state);
-
-                    NotifyListeners(new ProjectChangeEventArgs(workspaceProject.FilePath, ProjectChangeKind.ProjectChanged));
-                }
-            }
-        }
-
-        public override void WorkspaceProjectRemoved(Project workspaceProject)
-        {
-            if (workspaceProject == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceProject));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (!IsSupportedWorkspaceProject(workspaceProject))
-            {
-                return;
-            }
-
-            if (_projects.TryGetValue(workspaceProject.FilePath, out var entry))
-            {
-                // We also need to check the projectId here. If this is a multi-targeting project then we are only interested
-                // in a single workspace project. Make sure the WorkspaceProject we're using is the one that's being removed.
-                if (entry.State.WorkspaceProject?.Id != workspaceProject.Id)
-                {
-                    return;
-                }
-
-                ProjectState state;
-
-                // So if the WorkspaceProject got removed, we should double check to make sure that there aren't others
-                // hanging around. This could happen if a project is multi-targeting and one of the TFMs is removed.
-                var otherWorkspaceProject = GetWorkspaceProject(workspaceProject.FilePath);
-                if (otherWorkspaceProject != null && otherWorkspaceProject.Id != workspaceProject.Id)
-                {
-                    // OK there's another WorkspaceProject, use that.
-                    state = entry.State.WithWorkspaceProject(otherWorkspaceProject);
-                    _projects[otherWorkspaceProject.FilePath] = new Entry(state);
-
-                    NotifyListeners(new ProjectChangeEventArgs(otherWorkspaceProject.FilePath, ProjectChangeKind.ProjectChanged));
-                }
-                else
-                {
-                    state = entry.State.WithWorkspaceProject(null);
-                    _projects[workspaceProject.FilePath] = new Entry(state);
-
-                    // Notify listeners of a change because we've removed computed state.
-                    NotifyListeners(new ProjectChangeEventArgs(workspaceProject.FilePath, ProjectChangeKind.ProjectChanged));
-                }
-            }
-        }
-
-        public override void ReportError(Exception exception)
-        {
-            if (exception == null)
-            {
-                throw new ArgumentNullException(nameof(exception));
-            }
-
-            _errorReporter.ReportError(exception);
-        }
-
-        public override void ReportError(Exception exception, ProjectSnapshot project)
-        {
-            if (exception == null)
-            {
-                throw new ArgumentNullException(nameof(exception));
-            }
-
-            _errorReporter.ReportError(exception, project);
-        }
-
-        public override void ReportError(Exception exception, HostProject hostProject)
-        {
-            if (exception == null)
-            {
-                throw new ArgumentNullException(nameof(exception));
-            }
-
-            var snapshot = hostProject?.FilePath == null ? null : GetLoadedProject(hostProject.FilePath);
-            _errorReporter.ReportError(exception, snapshot);
-        }
-
-        public override void ReportError(Exception exception, Project workspaceProject)
-        {
-            if (exception == null)
-            {
-                throw new ArgumentNullException(nameof(exception));
-            }
-            
-            _errorReporter.ReportError(exception, workspaceProject);
-        }
-
-        // We're only interested in CSharp projects that have a FilePath. We rely on the FilePath to
-        // unify the Workspace Project with our HostProject concept.
-        private bool IsSupportedWorkspaceProject(Project workspaceProject) => workspaceProject.Language == LanguageNames.CSharp && workspaceProject.FilePath != null;
-
-        private Project GetWorkspaceProject(string filePath)
-        {
-            var solution = Workspace.CurrentSolution;
-            if (solution == null)
-            {
-                return null;
-            }
-
-            foreach (var workspaceProject in solution.Projects)
-            {
-                if (IsSupportedWorkspaceProject(workspaceProject) &&
-                    FilePathComparer.Instance.Equals(filePath, workspaceProject.FilePath))
-                {
-                    // We don't try to handle mulitple TFMs anwhere in Razor, just take the first WorkspaceProject that is a match. 
-                    return workspaceProject;
-                }
-            }
-
-            return null;
-        }
-
-        // virtual so it can be overridden in tests
-        protected virtual void NotifyListeners(ProjectChangeEventArgs e)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            var handler = Changed;
-            if (handler != null)
-            {
-                handler(this, e);
-            }
-        }
-
-        private class Entry
-        {
-            public ProjectSnapshot Snapshot;
-            public readonly ProjectState State;
-
-            public Entry(ProjectState state)
-            {
-                State = state;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshotManagerFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshotManagerFactory.cs
deleted file mode 100644
index b092174aa697..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshotManagerFactory.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    [Shared]
-    [ExportLanguageServiceFactory(typeof(ProjectSnapshotManager), RazorLanguage.Name)]
-    internal class DefaultProjectSnapshotManagerFactory : ILanguageServiceFactory
-    {
-        private readonly IEnumerable<ProjectSnapshotChangeTrigger> _triggers;
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-
-        [ImportingConstructor]
-        public DefaultProjectSnapshotManagerFactory(
-            ForegroundDispatcher foregroundDispatcher,
-            [ImportMany] IEnumerable<ProjectSnapshotChangeTrigger> triggers)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (triggers == null)
-            {
-                throw new ArgumentNullException(nameof(triggers));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _triggers = triggers;
-        }
-
-        public ILanguageService CreateLanguageService(HostLanguageServices languageServices)
-        {
-            if (languageServices == null)
-            {
-                throw new ArgumentNullException(nameof(languageServices));
-            }
-
-            return new DefaultProjectSnapshotManager(
-                _foregroundDispatcher,
-                languageServices.WorkspaceServices.GetRequiredService<ErrorReporter>(),
-                _triggers,
-                languageServices.WorkspaceServices.Workspace);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentGeneratedOutputTracker.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentGeneratedOutputTracker.cs
deleted file mode 100644
index a3e11da04fa9..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentGeneratedOutputTracker.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.Extensions.Internal;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class DocumentGeneratedOutputTracker
-    {
-        private readonly object _lock;
-
-        private DocumentGeneratedOutputTracker _older;
-        private Task<RazorCodeDocument> _task;
-        
-        private IReadOnlyList<TagHelperDescriptor> _tagHelpers;
-        private IReadOnlyList<ImportItem> _imports;
-
-        public DocumentGeneratedOutputTracker(DocumentGeneratedOutputTracker older)
-        {
-            _older = older;
-
-            _lock = new object();
-        }
-
-        public bool IsResultAvailable => _task?.IsCompleted == true;
-
-        public DocumentGeneratedOutputTracker Older => _older;
-
-        public Task<RazorCodeDocument> GetGeneratedOutputInitializationTask(ProjectSnapshot project, DocumentSnapshot document)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            if (document == null)
-            {
-                throw new ArgumentNullException(nameof(document));
-            }
-
-            if (_task == null)
-            {
-                lock (_lock)
-                {
-                    if (_task == null)
-                    {
-                        _task = GetGeneratedOutputInitializationTaskCore(project, document);
-                    }
-                }
-            }
-
-            return _task;
-        }
-
-        public DocumentGeneratedOutputTracker Fork()
-        {
-            return new DocumentGeneratedOutputTracker(this);
-        }
-
-        private async Task<RazorCodeDocument> GetGeneratedOutputInitializationTaskCore(ProjectSnapshot project, DocumentSnapshot document)
-        {
-            var tagHelpers = await project.GetTagHelpersAsync().ConfigureAwait(false);
-            var imports = await GetImportsAsync(project, document);
-
-            if (_older != null && _older.IsResultAvailable)
-            {
-                var tagHelperDifference = new HashSet<TagHelperDescriptor>(TagHelperDescriptorComparer.Default);
-                tagHelperDifference.UnionWith(_older._tagHelpers);
-                tagHelperDifference.SymmetricExceptWith(tagHelpers);
-
-                var importDifference = new HashSet<ImportItem>();
-                importDifference.UnionWith(_older._imports);
-                importDifference.SymmetricExceptWith(imports);
-
-                if (tagHelperDifference.Count == 0 && importDifference.Count == 0)
-                {
-                    // We can use the cached result.
-                    var result = _older._task.Result;
-
-                    // Drop reference so it can be GC'ed
-                    _older = null;
-
-                    // Cache the tag helpers and imports so the next version can use them
-                    _tagHelpers = tagHelpers;
-                    _imports = imports;
-
-                    return result;
-                }
-            }
-
-            // Drop reference so it can be GC'ed
-            _older = null;
-
-            // Cache the tag helpers and imports so the next version can use them
-            _tagHelpers = tagHelpers;
-            _imports = imports;
-
-            var importSources = new List<RazorSourceDocument>();
-            foreach (var item in imports)
-            {
-                var sourceDocument = await GetRazorSourceDocumentAsync(item.Import);
-                importSources.Add(sourceDocument);
-            }
-
-            var documentSource = await GetRazorSourceDocumentAsync(document);
-
-            var projectEngine = project.GetProjectEngine();
-
-            return projectEngine.ProcessDesignTime(documentSource, importSources, tagHelpers);
-        }
-
-        private async Task<RazorSourceDocument> GetRazorSourceDocumentAsync(DocumentSnapshot document)
-        {
-            var sourceText = await document.GetTextAsync();
-
-            return sourceText.GetRazorSourceDocument(document.FilePath);
-        }
-
-        private async Task<IReadOnlyList<ImportItem>> GetImportsAsync(ProjectSnapshot project, DocumentSnapshot document)
-        {
-            var imports = new List<ImportItem>();
-            foreach (var snapshot in document.GetImports())
-            {
-                var versionStamp = await snapshot.GetTextVersionAsync();
-                imports.Add(new ImportItem(snapshot.FilePath, versionStamp, snapshot));
-            }
-
-            return imports;
-        }
-
-        private struct ImportItem : IEquatable<ImportItem>
-        {
-            public ImportItem(string filePath, VersionStamp versionStamp, DocumentSnapshot import)
-            {
-                FilePath = filePath;
-                VersionStamp = versionStamp;
-                Import = import;
-            }
-
-            public string FilePath { get; }
-
-            public VersionStamp VersionStamp { get; }
-
-            public DocumentSnapshot Import { get; }
-
-            public bool Equals(ImportItem other)
-            {
-                return
-                    FilePathComparer.Instance.Equals(FilePath, other.FilePath) &&
-                    VersionStamp == other.VersionStamp;
-            }
-
-            public override bool Equals(object obj)
-            {
-                return obj is ImportItem item ? Equals(item) : false;
-            }
-
-            public override int GetHashCode()
-            {
-                var hash = new HashCodeCombiner();
-                hash.Add(FilePath, FilePathComparer.Instance);
-                hash.Add(VersionStamp);
-                return hash;
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentImportsTracker.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentImportsTracker.cs
deleted file mode 100644
index 96b927e42f46..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentImportsTracker.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class DocumentImportsTracker
-    {
-        private readonly object _lock;
-
-        private IReadOnlyList<DocumentSnapshot> _imports;
-
-        public DocumentImportsTracker()
-        {
-            _lock = new object();
-        }
-
-        public IReadOnlyList<DocumentSnapshot> GetImports(ProjectSnapshot project, DocumentSnapshot document)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            if (document == null)
-            {
-                throw new ArgumentNullException(nameof(document));
-            }
-
-            if (_imports == null)
-            {
-                lock (_lock)
-                {
-                    if (_imports == null)
-                    {
-                        _imports = GetImportsCore(project, document);
-                    }
-                }
-            }
-
-            return _imports;
-        }
-
-        private IReadOnlyList<DocumentSnapshot> GetImportsCore(ProjectSnapshot project, DocumentSnapshot document)
-        {
-            var projectEngine = project.GetProjectEngine();
-            var importFeature = projectEngine.ProjectFeatures.OfType<IImportProjectFeature>().FirstOrDefault();
-            var projectItem = projectEngine.FileSystem.GetItem(document.FilePath);
-            var importItems = importFeature?.GetImports(projectItem).Where(i => i.Exists);
-            if (importItems == null)
-            {
-                return Array.Empty<DocumentSnapshot>();
-            }
-
-            var imports = new List<DocumentSnapshot>();
-            foreach (var item in importItems)
-            {
-                if (item.PhysicalPath == null)
-                {
-                    // This is a default import.
-                    var defaultImport = new DefaultImportDocumentSnapshot(project, item);
-                    imports.Add(defaultImport);
-                }
-                else
-                {
-                    var import = project.GetDocument(item.PhysicalPath);
-                    if (import == null)
-                    {
-                        // We are not tracking this document in this project. So do nothing.
-                        continue;
-                    }
-
-                    imports.Add(import);
-                }
-            }
-
-            return imports;
-        }
-
-        private class DefaultImportDocumentSnapshot : DocumentSnapshot
-        {
-            private ProjectSnapshot _project;
-            private RazorProjectItem _importItem;
-            private SourceText _sourceText;
-            private VersionStamp _version;
-            private DocumentGeneratedOutputTracker _generatedOutput;
-
-            public DefaultImportDocumentSnapshot(ProjectSnapshot project, RazorProjectItem item)
-            {
-                _project = project;
-                _importItem = item;
-                _version = VersionStamp.Default;
-                _generatedOutput = new DocumentGeneratedOutputTracker(null);
-            }
-
-            public override string FilePath => null;
-
-            public override string TargetPath => null;
-
-            public override Task<RazorCodeDocument> GetGeneratedOutputAsync()
-            {
-                return _generatedOutput.GetGeneratedOutputInitializationTask(_project, this);
-            }
-
-            public override IReadOnlyList<DocumentSnapshot> GetImports()
-            {
-                return Array.Empty<DocumentSnapshot>();
-            }
-
-            public async override Task<SourceText> GetTextAsync()
-            {
-                using (var stream = _importItem.Read())
-                using (var reader = new StreamReader(stream))
-                {
-                    var content = await reader.ReadToEndAsync();
-                    _sourceText = SourceText.From(content);
-                }
-
-                return _sourceText;
-            }
-
-            public override Task<VersionStamp> GetTextVersionAsync()
-            {
-                return Task.FromResult(_version);
-            }
-
-            public override bool TryGetText(out SourceText result)
-            {
-                if (_sourceText != null)
-                {
-                    result = _sourceText;
-                    return true;
-                }
-
-                result = null;
-                return false;
-            }
-
-            public override bool TryGetTextVersion(out VersionStamp result)
-            {
-                result = _version;
-                return true;
-            }
-
-            public override bool TryGetGeneratedOutput(out RazorCodeDocument result)
-            {
-                if (_generatedOutput.IsResultAvailable)
-                {
-                    result = GetGeneratedOutputAsync().Result;
-                    return true;
-                }
-
-                result = null;
-                return false;
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentSnapshot.cs
deleted file mode 100644
index 0cc9da8f04e1..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentSnapshot.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal abstract class DocumentSnapshot
-    {
-        public abstract string FilePath { get; }
-
-        public abstract string TargetPath { get; }
-
-        public abstract IReadOnlyList<DocumentSnapshot> GetImports();
-
-        public abstract Task<SourceText> GetTextAsync();
-
-        public abstract Task<VersionStamp> GetTextVersionAsync();
-
-        public abstract Task<RazorCodeDocument> GetGeneratedOutputAsync();
-
-        public abstract bool TryGetText(out SourceText result);
-
-        public abstract bool TryGetTextVersion(out VersionStamp result);
-
-        public abstract bool TryGetGeneratedOutput(out RazorCodeDocument result);
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs
deleted file mode 100644
index d1fb05b67a86..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class DocumentState
-    {
-        private static readonly TextAndVersion EmptyText = TextAndVersion.Create(
-            SourceText.From(string.Empty),
-            VersionStamp.Default);
-
-        public static readonly Func<Task<TextAndVersion>> EmptyLoader = () => Task.FromResult(EmptyText);
-
-        private readonly object _lock;
-
-        private Func<Task<TextAndVersion>> _loader;
-        private Task<TextAndVersion> _loaderTask;
-        private SourceText _sourceText;
-        private VersionStamp? _version;
-
-        private DocumentGeneratedOutputTracker _generatedOutput;
-        private DocumentImportsTracker _imports;
-
-        public static DocumentState Create(
-            HostWorkspaceServices services,
-            HostDocument hostDocument,
-            Func<Task<TextAndVersion>> loader)
-        {
-            if (services == null)
-            {
-                throw new ArgumentNullException(nameof(services));
-            }
-
-            if (hostDocument == null)
-            {
-                throw new ArgumentNullException(nameof(hostDocument));
-            }
-
-            loader = loader ?? EmptyLoader;
-            return new DocumentState(services, hostDocument, null, null, loader);
-        }
-
-        // Internal for testing
-        internal DocumentState(
-            HostWorkspaceServices services,
-            HostDocument hostDocument,
-            SourceText text,
-            VersionStamp? version,
-            Func<Task<TextAndVersion>> loader)
-        {
-            Services = services;
-            HostDocument = hostDocument;
-            _sourceText = text;
-            _version = version;
-            _loader = loader;
-            _lock = new object();
-        }
-
-        public HostDocument HostDocument { get; }
-
-        public HostWorkspaceServices Services { get; }
-
-        public DocumentGeneratedOutputTracker GeneratedOutput
-        {
-            get
-            {
-                if (_generatedOutput == null)
-                {
-                    lock (_lock)
-                    {
-                        if (_generatedOutput == null)
-                        {
-                            _generatedOutput = new DocumentGeneratedOutputTracker(null);
-                        }
-                    }
-                }
-
-                return _generatedOutput;
-            }
-        }
-
-        public DocumentImportsTracker Imports
-        {
-            get
-            {
-                if (_imports == null)
-                {
-                    lock (_lock)
-                    {
-                        if (_imports == null)
-                        {
-                            _imports = new DocumentImportsTracker();
-                        }
-                    }
-                }
-
-                return _imports;
-            }
-        }
-
-        public async Task<SourceText> GetTextAsync()
-        {
-            if (TryGetText(out var text))
-            {
-                return text;
-            }
-
-            lock (_lock)
-            {
-                _loaderTask = _loader();
-            }
-
-            return (await _loaderTask.ConfigureAwait(false)).Text;
-        }
-
-        public async Task<VersionStamp> GetTextVersionAsync()
-        {
-            if (TryGetTextVersion(out var version))
-            {
-                return version;
-            }
-
-            lock (_lock)
-            {
-                _loaderTask = _loader();
-            }
-
-            return (await _loaderTask.ConfigureAwait(false)).Version;
-        }
-
-        public bool TryGetText(out SourceText result)
-        {
-            if (_sourceText != null)
-            {
-                result = _sourceText;
-                return true;
-            }
-
-            if (_loaderTask != null && _loaderTask.IsCompleted)
-            {
-                result = _loaderTask.Result.Text;
-                return true;
-            }
-
-            result = null;
-            return false;
-        }
-
-        public bool TryGetTextVersion(out VersionStamp result)
-        {
-            if (_version != null)
-            {
-                result = _version.Value;
-                return true;
-            }
-
-            if (_loaderTask != null && _loaderTask.IsCompleted)
-            {
-                result = _loaderTask.Result.Version;
-                return true;
-            }
-
-            result = default;
-            return false;
-        }
-
-        public virtual DocumentState WithConfigurationChange()
-        {
-            var state = new DocumentState(Services, HostDocument, _sourceText, _version, _loader);
-
-            // The source could not have possibly changed.
-            state._sourceText = _sourceText;
-            state._version = _version;
-            state._loaderTask = _loaderTask;
-
-            return state;
-        }
-
-        public virtual DocumentState WithWorkspaceProjectChange()
-        {
-            var state = new DocumentState(Services, HostDocument, _sourceText, _version, _loader);
-
-            // The source could not have possibly changed.
-            state._sourceText = _sourceText;
-            state._version = _version;
-            state._loaderTask = _loaderTask;
-
-            // Opportunistically cache the generated code
-            state._generatedOutput = _generatedOutput?.Fork();
-
-            return state;
-        }
-
-        public virtual DocumentState WithText(SourceText sourceText, VersionStamp version)
-        {
-            if (sourceText == null)
-            {
-                throw new ArgumentNullException(nameof(sourceText));
-            }
-
-            return new DocumentState(Services, HostDocument, sourceText, version, null);
-        }
-
-        public virtual DocumentState WithTextLoader(Func<Task<TextAndVersion>> loader)
-        {
-            if (loader == null)
-            {
-                throw new ArgumentNullException(nameof(loader));
-            }
-
-            return new DocumentState(Services, HostDocument, null, null, loader);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/EphemeralProjectSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/EphemeralProjectSnapshot.cs
deleted file mode 100644
index cd87c074deda..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/EphemeralProjectSnapshot.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Host;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class EphemeralProjectSnapshot : ProjectSnapshot
-    {
-        private static readonly Task<IReadOnlyList<TagHelperDescriptor>> EmptyTagHelpers = Task.FromResult<IReadOnlyList<TagHelperDescriptor>>(Array.Empty<TagHelperDescriptor>());
-
-        private readonly HostWorkspaceServices _services;
-        private readonly Lazy<RazorProjectEngine> _projectEngine;
-
-        public EphemeralProjectSnapshot(HostWorkspaceServices services, string filePath)
-        {
-            if (services == null)
-            {
-                throw new ArgumentNullException(nameof(services));
-            }
-
-            if (filePath == null)
-            {
-                throw new ArgumentNullException(nameof(filePath));
-            }
-
-            _services = services;
-            FilePath = filePath;
-
-            _projectEngine = new Lazy<RazorProjectEngine>(CreateProjectEngine);
-        }
-
-        public override RazorConfiguration Configuration => FallbackRazorConfiguration.MVC_2_1;
-
-        public override IEnumerable<string> DocumentFilePaths => Array.Empty<string>();
-
-        public override string FilePath { get; }
-
-        public override bool IsInitialized => false;
-
-        public override VersionStamp Version { get; } = VersionStamp.Default;
-
-        public override Project WorkspaceProject => null;
-
-        public override DocumentSnapshot GetDocument(string filePath)
-        {
-            if (filePath == null)
-            {
-                throw new ArgumentNullException(nameof(filePath));
-            }
-
-            return null;
-        }
-
-        public override RazorProjectEngine GetProjectEngine()
-        {
-            return _projectEngine.Value;
-        }
-
-        public override Task<IReadOnlyList<TagHelperDescriptor>> GetTagHelpersAsync()
-        {
-            return EmptyTagHelpers;
-        }
-
-        public override bool TryGetTagHelpers(out IReadOnlyList<TagHelperDescriptor> result)
-        {
-            result = EmptyTagHelpers.Result;
-            return true;
-        }
-
-        private RazorProjectEngine CreateProjectEngine()
-        {
-            var factory = _services.GetRequiredService<ProjectSnapshotProjectEngineFactory>();
-            return factory.Create(this);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/FallbackRazorConfiguration.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/FallbackRazorConfiguration.cs
deleted file mode 100644
index 024b421312a2..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/FallbackRazorConfiguration.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class FallbackRazorConfiguration : RazorConfiguration
-    {
-        public static readonly RazorConfiguration MVC_1_0 = new FallbackRazorConfiguration(
-            RazorLanguageVersion.Version_1_0,
-            "MVC-1.0",
-            new[] { new FallbackRazorExtension("MVC-1.0"), });
-
-        public static readonly RazorConfiguration MVC_1_1 = new FallbackRazorConfiguration(
-            RazorLanguageVersion.Version_1_1,
-            "MVC-1.1",
-            new[] { new FallbackRazorExtension("MVC-1.1"), });
-
-       public static readonly RazorConfiguration MVC_2_0 = new FallbackRazorConfiguration(
-            RazorLanguageVersion.Version_2_0,
-            "MVC-2.0",
-            new[] { new FallbackRazorExtension("MVC-2.0"), });
-
-        public static readonly RazorConfiguration MVC_2_1 = new FallbackRazorConfiguration(
-             RazorLanguageVersion.Version_2_1,
-             "MVC-2.1",
-             new[] { new FallbackRazorExtension("MVC-2.1"), });
-
-
-        public static RazorConfiguration SelectConfiguration(Version version)
-        {
-            if (version.Major == 1 && version.Minor == 0)
-            {
-                return MVC_1_0;
-            }
-            else if (version.Major == 1 && version.Minor == 1)
-            {
-                return MVC_1_1;
-            }
-            else if (version.Major == 2 && version.Minor == 0)
-            {
-                return MVC_2_0;
-            }
-            else if (version.Major == 2 && version.Minor == 1)
-            {
-                return MVC_2_1;
-            }
-            else
-            {
-                return MVC_2_1;
-            }
-        }
-
-        public FallbackRazorConfiguration(
-            RazorLanguageVersion languageVersion,
-            string configurationName,
-            RazorExtension[] extensions)
-        {
-            if (languageVersion == null)
-            {
-                throw new ArgumentNullException(nameof(languageVersion));
-            }
-
-            if (configurationName == null)
-            {
-                throw new ArgumentNullException(nameof(configurationName));
-            }
-
-            if (extensions == null)
-            {
-                throw new ArgumentNullException(nameof(extensions));
-            }
-
-            LanguageVersion = languageVersion;
-            ConfigurationName = configurationName;
-            Extensions = extensions;
-        }
-
-        public override string ConfigurationName { get; }
-
-        public override IReadOnlyList<RazorExtension> Extensions { get; }
-
-        public override RazorLanguageVersion LanguageVersion { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/FallbackRazorExtension.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/FallbackRazorExtension.cs
deleted file mode 100644
index 5080b0705dca..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/FallbackRazorExtension.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class FallbackRazorExtension : RazorExtension
-    {
-        public FallbackRazorExtension(string extensionName)
-        {
-            if (extensionName == null)
-            {
-                throw new ArgumentNullException(nameof(extensionName));
-            }
-
-            ExtensionName = extensionName;
-        }
-
-        public override string ExtensionName { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/HostDocument.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/HostDocument.cs
deleted file mode 100644
index 859cc0df3246..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/HostDocument.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class HostDocument
-    {
-        public HostDocument(string filePath, string targetPath)
-        {
-            if (filePath == null)
-            {
-                throw new ArgumentNullException(nameof(filePath));
-            }
-
-            if (targetPath == null)
-            {
-                throw new ArgumentNullException(nameof(targetPath));
-            }
-
-            FilePath = filePath;
-            TargetPath = targetPath;
-        }
-
-        public string FilePath { get; }
-
-        public string TargetPath { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/HostProject.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/HostProject.cs
deleted file mode 100644
index cf3c1524b6ed..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/HostProject.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class HostProject
-    {
-        public HostProject(string projectFilePath, RazorConfiguration razorConfiguration)
-        {
-            if (projectFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(projectFilePath));
-            }
-
-            if (razorConfiguration == null)
-            {
-                throw new ArgumentNullException(nameof(razorConfiguration));
-            }
-
-            FilePath = projectFilePath;
-            Configuration = razorConfiguration;
-        }
-
-        public RazorConfiguration Configuration { get; }
-
-        public string FilePath { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/LiveShareProjectSnapshotBase.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/LiveShareProjectSnapshotBase.cs
deleted file mode 100644
index f03a31b0ae4e..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/LiveShareProjectSnapshotBase.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.CodeAnalysis.Razor.Workspaces.ProjectSystem
-{
-    // This is a marker class to allow us to know when potential breaking changes might impact live share.
-    // This is intentionally not abstract so any API changes that happen to ProjectSnapshot will break this.
-    internal class LiveShareProjectSnapshotBase : ProjectSnapshot
-    {
-        public override RazorConfiguration Configuration => throw new NotImplementedException();
-
-        public override IEnumerable<string> DocumentFilePaths => throw new NotImplementedException();
-
-        public override string FilePath => throw new NotImplementedException();
-
-        public override bool IsInitialized => throw new NotImplementedException();
-
-        public override VersionStamp Version => throw new NotImplementedException();
-
-        public override Project WorkspaceProject => throw new NotImplementedException();
-
-        public override DocumentSnapshot GetDocument(string filePath) => throw new NotImplementedException();
-
-        public override RazorProjectEngine GetProjectEngine() => throw new NotImplementedException();
-
-        public override Task<IReadOnlyList<TagHelperDescriptor>> GetTagHelpersAsync() => throw new NotImplementedException();
-
-        public override bool TryGetTagHelpers(out IReadOnlyList<TagHelperDescriptor> result) => throw new NotImplementedException();
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectChangeEventArgs.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectChangeEventArgs.cs
deleted file mode 100644
index a163ba5f1b16..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectChangeEventArgs.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class ProjectChangeEventArgs : EventArgs
-    {
-        public ProjectChangeEventArgs(string projectFilePath, ProjectChangeKind kind)
-        {
-            if (projectFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(projectFilePath));
-            }
-
-            ProjectFilePath = projectFilePath;
-            Kind = kind;
-        }
-
-        public ProjectChangeEventArgs(string projectFilePath, string documentFilePath, ProjectChangeKind kind)
-        {
-            if (projectFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(projectFilePath));
-            }
-
-            ProjectFilePath = projectFilePath;
-            DocumentFilePath = documentFilePath;
-            Kind = kind;
-        }
-
-        public string ProjectFilePath { get; }
-
-        public string DocumentFilePath { get; }
-
-        public ProjectChangeKind Kind { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectChangeKind.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectChangeKind.cs
deleted file mode 100644
index 98bd0a40101d..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectChangeKind.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal enum ProjectChangeKind
-    {
-        ProjectAdded,
-        ProjectRemoved,
-        ProjectChanged,
-        DocumentAdded,
-        DocumentRemoved,
-
-        // This could be a state change (opened/closed) or a content change.
-        DocumentChanged,
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectDifference.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectDifference.cs
deleted file mode 100644
index 138acdb312d8..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectDifference.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    [Flags]
-    internal enum ProjectDifference
-    {
-        None = 0,
-        ConfigurationChanged = 1,
-        WorkspaceProjectAdded = 2,
-        WorkspaceProjectRemoved = 4,
-        WorkspaceProjectChanged = 8,
-        DocumentAdded = 16,
-        DocumentRemoved = 32,
-        DocumentChanged = 64,
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectEngineTracker.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectEngineTracker.cs
deleted file mode 100644
index 6e54daed0bd8..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectEngineTracker.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Host;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class ProjectEngineTracker
-    {
-        private const ProjectDifference Mask = ProjectDifference.ConfigurationChanged;
-
-        private readonly object _lock = new object();
-
-        private readonly HostWorkspaceServices _services;
-        private RazorProjectEngine _projectEngine;
-
-        public ProjectEngineTracker(ProjectState state)
-        {
-            if (state == null)
-            {
-                throw new ArgumentNullException(nameof(state));
-            }
-
-            _services = state.Services;
-        }
-
-        public ProjectEngineTracker ForkFor(ProjectState state, ProjectDifference difference)
-        {
-            if (state == null)
-            {
-                throw new ArgumentNullException(nameof(state));
-            }
-
-            if ((difference & Mask) != 0)
-            {
-                return null;
-            }
-
-            return this;
-        }
-
-        public RazorProjectEngine GetProjectEngine(ProjectSnapshot snapshot)
-        {
-            if (snapshot == null)
-            {
-                throw new ArgumentNullException(nameof(snapshot));
-            }
-
-            if (_projectEngine == null)
-            {
-                lock (_lock)
-                {
-                    if (_projectEngine == null)
-                    {
-                        var factory = _services.GetRequiredService<ProjectSnapshotProjectEngineFactory>();
-                        _projectEngine = factory.Create(snapshot);
-                    }
-                }
-            }
-
-            return _projectEngine;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshot.cs
deleted file mode 100644
index 418d117ff271..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshot.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal abstract class ProjectSnapshot
-    {
-        public abstract RazorConfiguration Configuration { get; }
-
-        public abstract IEnumerable<string> DocumentFilePaths { get; }
-
-        public abstract string FilePath { get; }
-
-        public abstract bool IsInitialized { get; }
-
-        public abstract VersionStamp Version { get; }
-
-        public abstract Project WorkspaceProject { get; }
-
-        public abstract RazorProjectEngine GetProjectEngine();
-
-        public abstract DocumentSnapshot GetDocument(string filePath);
-
-        public abstract Task<IReadOnlyList<TagHelperDescriptor>> GetTagHelpersAsync();
-
-        public abstract bool TryGetTagHelpers(out IReadOnlyList<TagHelperDescriptor> result);
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshotChangeTrigger.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshotChangeTrigger.cs
deleted file mode 100644
index da27aefe0ce2..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshotChangeTrigger.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal abstract class ProjectSnapshotChangeTrigger
-    {
-        public abstract void Initialize(ProjectSnapshotManagerBase projectManager);
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshotManager.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshotManager.cs
deleted file mode 100644
index 40dfec08a920..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshotManager.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.CodeAnalysis.Host;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal abstract class ProjectSnapshotManager : ILanguageService
-    {
-        public abstract event EventHandler<ProjectChangeEventArgs> Changed;
-
-        public abstract IReadOnlyList<ProjectSnapshot> Projects { get; }
-
-        public abstract bool IsDocumentOpen(string documentFilePath);
-
-        public abstract ProjectSnapshot GetLoadedProject(string filePath);
-
-        public abstract ProjectSnapshot GetOrCreateProject(string filePath);
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshotManagerBase.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshotManagerBase.cs
deleted file mode 100644
index 5545bbb3a8d4..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshotManagerBase.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal abstract class ProjectSnapshotManagerBase : ProjectSnapshotManager
-    {
-        public abstract Workspace Workspace { get; }
-
-        public abstract void DocumentAdded(HostProject hostProject, HostDocument hostDocument, TextLoader textLoader);
-
-        // Yeah this is kinda ugly.
-        public abstract void DocumentOpened(string projectFilePath, string documentFilePath, SourceText sourceText);
-
-        public abstract void DocumentClosed(string projectFilePath, string documentFilePath, TextLoader textLoader);
-
-        public abstract void DocumentChanged(string projectFilePath, string documentFilePath, TextLoader textLoader);
-
-        public abstract void DocumentChanged(string projectFilePath, string documentFilePath, SourceText sourceText);
-
-        public abstract void DocumentRemoved(HostProject hostProject, HostDocument hostDocument);
-
-        public abstract void HostProjectAdded(HostProject hostProject);
-
-        public abstract void HostProjectChanged(HostProject hostProject);
-
-        public abstract void HostProjectRemoved(HostProject hostProject);
-
-        public abstract void WorkspaceProjectAdded(Project workspaceProject);
-
-        public abstract void WorkspaceProjectChanged(Project workspaceProject);
-
-        public abstract void WorkspaceProjectRemoved(Project workspaceProject);
-
-        public abstract void ReportError(Exception exception);
-
-        public abstract void ReportError(Exception exception, ProjectSnapshot project);
-
-        public abstract void ReportError(Exception exception, HostProject hostProject);
-
-        public abstract void ReportError(Exception exception, Project workspaceProject);
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectState.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectState.cs
deleted file mode 100644
index 6670ba55a217..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectState.cs
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    // Internal tracker for DefaultProjectSnapshot
-    internal class ProjectState
-    {
-        private static readonly IReadOnlyDictionary<string, DocumentState> EmptyDocuments = new Dictionary<string, DocumentState>();
-
-        private readonly object _lock;
-
-        private ProjectEngineTracker _projectEngine;
-        private ProjectTagHelperTracker _tagHelpers;
-
-        public static ProjectState Create(HostWorkspaceServices services, HostProject hostProject, Project workspaceProject = null)
-        {
-            if (services == null)
-            {
-                throw new ArgumentNullException(nameof(services));
-            }
-
-            if (hostProject == null)
-            {
-                throw new ArgumentNullException(nameof(hostProject));
-            }
-
-            return new ProjectState(services, hostProject, workspaceProject);
-        }
-        
-        private ProjectState(
-            HostWorkspaceServices services,
-            HostProject hostProject,
-            Project workspaceProject)
-        {
-            Services = services;
-            HostProject = hostProject;
-            WorkspaceProject = workspaceProject;
-            Documents = EmptyDocuments;
-            Version = VersionStamp.Create();
-
-            _lock = new object();
-        }
-
-        private ProjectState(
-            ProjectState older,
-            ProjectDifference difference,
-            HostProject hostProject,
-            Project workspaceProject,
-            IReadOnlyDictionary<string, DocumentState> documents)
-        {
-            if (older == null)
-            {
-                throw new ArgumentNullException(nameof(older));
-            }
-
-            if (hostProject == null)
-            {
-                throw new ArgumentNullException(nameof(hostProject));
-            }
-
-            if (documents == null)
-            {
-                throw new ArgumentNullException(nameof(documents));
-            }
-
-            Services = older.Services;
-            Version = older.Version.GetNewerVersion();
-
-            HostProject = hostProject;
-            WorkspaceProject = workspaceProject;
-            Documents = documents;
-
-            _lock = new object();
-
-            _projectEngine = older._projectEngine?.ForkFor(this, difference);
-            _tagHelpers = older._tagHelpers?.ForkFor(this, difference);
-        }
-
-        // Internal set for testing.
-        public IReadOnlyDictionary<string, DocumentState> Documents { get; internal set; }
-
-        public HostProject HostProject { get; }
-
-        public HostWorkspaceServices Services { get; }
-
-        public Project WorkspaceProject { get; }
-
-        public VersionStamp Version { get; }
-
-        // Computed State
-        public ProjectEngineTracker ProjectEngine
-        {
-            get
-            {
-                if (_projectEngine == null)
-                {
-                    lock (_lock)
-                    {
-                        if (_projectEngine == null)
-                        {
-                            _projectEngine = new ProjectEngineTracker(this);
-                        }
-                    }
-                }
-
-                return _projectEngine;
-            }
-        }
-
-        // Computed State
-        public ProjectTagHelperTracker TagHelpers
-        {
-            get
-            {
-                if (_tagHelpers == null)
-                {
-                    lock (_lock)
-                    {
-                        if (_tagHelpers == null)
-                        {
-                            _tagHelpers = new ProjectTagHelperTracker(this);
-                        }
-                    }
-                }
-
-                return _tagHelpers;
-            }
-        }
-
-        public ProjectState WithAddedHostDocument(HostDocument hostDocument, Func<Task<TextAndVersion>> loader)
-        {
-            if (hostDocument == null)
-            {
-                throw new ArgumentNullException(nameof(hostDocument));
-            }
-
-            if (loader == null)
-            {
-                throw new ArgumentNullException(nameof(loader));
-            }
-
-            // Ignore attempts to 'add' a document with different data, we only
-            // care about one, so it might as well be the one we have.
-            if (Documents.ContainsKey(hostDocument.FilePath))
-            {
-                return this;
-            }
-
-            var documents = new Dictionary<string, DocumentState>(FilePathComparer.Instance);
-            foreach (var kvp in Documents)
-            {
-                documents.Add(kvp.Key, kvp.Value);
-            }
-            
-            documents.Add(hostDocument.FilePath, DocumentState.Create(Services, hostDocument, loader));
-
-            var difference = ProjectDifference.DocumentAdded;
-            var state = new ProjectState(this, difference, HostProject, WorkspaceProject, documents);
-            return state;
-        }
-
-        public ProjectState WithRemovedHostDocument(HostDocument hostDocument)
-        {
-            if (hostDocument == null)
-            {
-                throw new ArgumentNullException(nameof(hostDocument));
-            }
-
-            if (!Documents.ContainsKey(hostDocument.FilePath))
-            {
-                return this;
-            }
-
-            var documents = new Dictionary<string, DocumentState>(FilePathComparer.Instance);
-            foreach (var kvp in Documents)
-            {
-                documents.Add(kvp.Key, kvp.Value);
-            }
-
-            documents.Remove(hostDocument.FilePath);
-
-            var difference = ProjectDifference.DocumentRemoved;
-            var state = new ProjectState(this, difference, HostProject, WorkspaceProject, documents);
-            return state;
-        }
-
-        public ProjectState WithChangedHostDocument(HostDocument hostDocument, SourceText sourceText, VersionStamp version)
-        {
-            if (hostDocument == null)
-            {
-                throw new ArgumentNullException(nameof(hostDocument));
-            }
-
-            if (!Documents.ContainsKey(hostDocument.FilePath))
-            {
-                return this;
-            }
-
-            var documents = new Dictionary<string, DocumentState>(FilePathComparer.Instance);
-            foreach (var kvp in Documents)
-            {
-                documents.Add(kvp.Key, kvp.Value);
-            }
-
-            if (documents.TryGetValue(hostDocument.FilePath, out var document))
-            {
-                documents[hostDocument.FilePath] = document.WithText(sourceText, version);
-            }
-
-            var state = new ProjectState(this, ProjectDifference.DocumentChanged, HostProject, WorkspaceProject, documents);
-            return state;
-        }
-
-        public ProjectState WithChangedHostDocument(HostDocument hostDocument, Func<Task<TextAndVersion>> loader)
-        {
-            if (hostDocument == null)
-            {
-                throw new ArgumentNullException(nameof(hostDocument));
-            }
-
-            if (!Documents.ContainsKey(hostDocument.FilePath))
-            {
-                return this;
-            }
-
-            var documents = new Dictionary<string, DocumentState>(FilePathComparer.Instance);
-            foreach (var kvp in Documents)
-            {
-                documents.Add(kvp.Key, kvp.Value);
-            }
-
-            if (documents.TryGetValue(hostDocument.FilePath, out var document))
-            {
-                documents[hostDocument.FilePath] = document.WithTextLoader(loader);
-            }
-
-            var state = new ProjectState(this, ProjectDifference.DocumentChanged, HostProject, WorkspaceProject, documents);
-            return state;
-        }
-
-        public ProjectState WithHostProject(HostProject hostProject)
-        {
-            if (hostProject == null)
-            {
-                throw new ArgumentNullException(nameof(hostProject));
-            }
-
-            if (HostProject.Configuration.Equals(hostProject.Configuration))
-            {
-                return this;
-            }
-
-            var difference = ProjectDifference.ConfigurationChanged;
-            var documents = new Dictionary<string, DocumentState>(FilePathComparer.Instance);
-            foreach (var kvp in Documents)
-            {
-                documents.Add(kvp.Key, kvp.Value.WithConfigurationChange());
-            }
-
-            var state = new ProjectState(this, difference, hostProject, WorkspaceProject, documents);
-            return state;
-        }
-
-        public ProjectState WithWorkspaceProject(Project workspaceProject)
-        {
-            var difference = ProjectDifference.None;
-            if (WorkspaceProject == null && workspaceProject != null)
-            {
-                difference |= ProjectDifference.WorkspaceProjectAdded;
-            }
-            else if (WorkspaceProject != null && workspaceProject == null)
-            {
-                difference |= ProjectDifference.WorkspaceProjectRemoved;
-            }
-            else
-            {
-                // We always update the snapshot right now when the project changes. This is how
-                // we deal with changes to the content of C# sources.
-                difference |= ProjectDifference.WorkspaceProjectChanged;
-            }
-
-            if (difference == ProjectDifference.None)
-            {
-                return this;
-            }
-
-            var documents = new Dictionary<string, DocumentState>(FilePathComparer.Instance);
-            foreach (var kvp in Documents)
-            {
-                documents.Add(kvp.Key, kvp.Value.WithWorkspaceProjectChange());
-            }
-
-            var state = new ProjectState(this, difference, HostProject, workspaceProject, documents);
-            return state;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSystemRazorConfiguration.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSystemRazorConfiguration.cs
deleted file mode 100644
index 43dfebe86445..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSystemRazorConfiguration.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class ProjectSystemRazorConfiguration : RazorConfiguration
-    {
-        public ProjectSystemRazorConfiguration(
-            RazorLanguageVersion languageVersion,
-            string configurationName,
-            RazorExtension[] extensions)
-        {
-            if (languageVersion == null)
-            {
-                throw new ArgumentNullException(nameof(languageVersion));
-            }
-
-            if (configurationName == null)
-            {
-                throw new ArgumentNullException(nameof(configurationName));
-            }
-
-            if (extensions == null)
-            {
-                throw new ArgumentNullException(nameof(extensions));
-            }
-
-            LanguageVersion = languageVersion;
-            ConfigurationName = configurationName;
-            Extensions = extensions;
-        }
-
-        public override string ConfigurationName { get; }
-
-        public override IReadOnlyList<RazorExtension> Extensions { get; }
-
-        public override RazorLanguageVersion LanguageVersion { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSystemRazorExtension.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSystemRazorExtension.cs
deleted file mode 100644
index 77f742c5639a..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSystemRazorExtension.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class ProjectSystemRazorExtension : RazorExtension
-    {
-        public ProjectSystemRazorExtension(string extensionName)
-        {
-            if (extensionName == null)
-            {
-                throw new ArgumentNullException(nameof(extensionName));
-            }
-
-            ExtensionName = extensionName;
-        }
-
-        public override string ExtensionName { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectTagHelperTracker.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectTagHelperTracker.cs
deleted file mode 100644
index 0c3be4ddec9e..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectTagHelperTracker.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Host;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class ProjectTagHelperTracker
-    {
-        private const ProjectDifference Mask =
-            ProjectDifference.ConfigurationChanged |
-            ProjectDifference.WorkspaceProjectAdded |
-            ProjectDifference.WorkspaceProjectChanged |
-            ProjectDifference.WorkspaceProjectRemoved;
-
-        private readonly object _lock = new object();
-        private readonly HostWorkspaceServices _services;
-
-        private Task<IReadOnlyList<TagHelperDescriptor>> _task;
-
-        public ProjectTagHelperTracker(ProjectState state)
-        {
-            if (state == null)
-            {
-                throw new ArgumentNullException(nameof(state));
-            }
-
-            _services = state.Services;
-        }
-
-        public bool IsResultAvailable => _task?.IsCompleted == true;
-
-        public ProjectTagHelperTracker ForkFor(ProjectState state, ProjectDifference difference)
-        {
-            if (state == null)
-            {
-                throw new ArgumentNullException(nameof(state));
-            }
-
-            if ((difference & Mask) != 0)
-            {
-                return null;
-            }
-
-            return this;
-        }
-
-        public Task<IReadOnlyList<TagHelperDescriptor>> GetTagHelperInitializationTask(ProjectSnapshot snapshot)
-        {
-            if (snapshot == null)
-            {
-                throw new ArgumentNullException(nameof(snapshot));
-            }
-
-            if (_task == null)
-            {
-                lock (_lock)
-                {
-                    if (_task == null)
-                    {
-                        _task = GetTagHelperInitializationTaskCore(snapshot);
-                    }
-                }
-            }
-
-            return _task;
-        }
-
-        private async Task<IReadOnlyList<TagHelperDescriptor>> GetTagHelperInitializationTaskCore(ProjectSnapshot snapshot)
-        {
-            var resolver = _services.GetLanguageServices(RazorLanguage.Name).GetRequiredService<TagHelperResolver>();
-            return (await resolver.GetTagHelpersAsync(snapshot)).Descriptors;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/WorkspaceProjectSnapshotChangeTrigger.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/WorkspaceProjectSnapshotChangeTrigger.cs
deleted file mode 100644
index f5bbee95de5d..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/WorkspaceProjectSnapshotChangeTrigger.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Composition;
-using System.Diagnostics;
-using System.Threading.Tasks;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    [Export(typeof(ProjectSnapshotChangeTrigger))]
-    internal class WorkspaceProjectSnapshotChangeTrigger : ProjectSnapshotChangeTrigger
-    {
-        private ProjectSnapshotManagerBase _projectManager;
-
-        public int ProjectChangeDelay { get;  set; } = 3 * 1000;
-
-        // We throttle updates to projects to prevent doing too much work while the projects
-        // are being initialized.
-        //
-        // Internal for testing
-        internal Dictionary<ProjectId, Task> _deferredUpdates;
-
-        public override void Initialize(ProjectSnapshotManagerBase projectManager)
-        {
-            _projectManager = projectManager;
-            _projectManager.Workspace.WorkspaceChanged += Workspace_WorkspaceChanged;
-
-            _deferredUpdates = new Dictionary<ProjectId, Task>();
-
-            InitializeSolution(_projectManager.Workspace.CurrentSolution);
-        }
-
-        private void InitializeSolution(Solution solution)
-        {
-            Debug.Assert(solution != null);
-
-            foreach (var project in solution.Projects)
-            {
-                _projectManager.WorkspaceProjectAdded(project);
-            }
-        }
-
-        // Internal for testing
-        internal void Workspace_WorkspaceChanged(object sender, WorkspaceChangeEventArgs e)
-        {
-            Project project;
-            switch (e.Kind)
-            {
-                case WorkspaceChangeKind.ProjectAdded:
-                    {
-                        project = e.NewSolution.GetProject(e.ProjectId);
-                        Debug.Assert(project != null);
-
-                        _projectManager.WorkspaceProjectAdded(project);
-                        break;
-                    }
-
-                case WorkspaceChangeKind.ProjectChanged:
-                case WorkspaceChangeKind.ProjectReloaded:
-                    {
-                        EnqueueUpdate(e.ProjectId);
-                        break;
-                    }
-
-                case WorkspaceChangeKind.ProjectRemoved:
-                    {
-                        project = e.OldSolution.GetProject(e.ProjectId);
-                        Debug.Assert(project != null);
-
-                        _projectManager.WorkspaceProjectRemoved(project);
-                        break;
-                    }
-
-                case WorkspaceChangeKind.SolutionAdded:
-                case WorkspaceChangeKind.SolutionChanged:
-                case WorkspaceChangeKind.SolutionCleared:
-                case WorkspaceChangeKind.SolutionReloaded:
-                case WorkspaceChangeKind.SolutionRemoved:
-
-                    if (e.OldSolution != null)
-                    {
-                        foreach (var p in e.OldSolution.Projects)
-                        {
-                            _projectManager.WorkspaceProjectRemoved(p);
-                        }
-                    }
-
-                    InitializeSolution(e.NewSolution);
-                    break;
-            }
-        }
-
-        private void EnqueueUpdate(ProjectId projectId)
-        {
-            // A race is not possible here because we use the main thread to synchronize the updates
-            // by capturing the sync context.
-            if (!_deferredUpdates.TryGetValue(projectId, out var update) || update.IsCompleted)
-            {
-                _deferredUpdates[projectId] = UpdateAfterDelay(projectId);
-            }
-        }
-
-        private async Task UpdateAfterDelay(ProjectId projectId)
-        {
-            await Task.Delay(ProjectChangeDelay);
-
-            var solution = _projectManager.Workspace.CurrentSolution;
-            var workspaceProject = solution.GetProject(projectId);
-            if (workspaceProject != null)
-            {
-                _projectManager.WorkspaceProjectChanged(workspaceProject);
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/AssemblyInfo.cs
deleted file mode 100644
index fefb5cd1de5a..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Mac.RazorAddin, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Remote.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Mac.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.RazorExtension, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/Resources.Designer.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/Resources.Designer.cs
deleted file mode 100644
index 058b78c6ed93..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// <auto-generated />
-namespace Microsoft.CodeAnalysis.Razor.Workspaces
-{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class Resources
-    {
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.CodeAnalysis.Razor.Workspaces.Resources", typeof(Resources).GetTypeInfo().Assembly);
-
-        /// <summary>
-        /// Value cannot be null or an empty string.
-        /// </summary>
-        internal static string ArgumentCannotBeNullOrEmpty
-        {
-            get => GetString("ArgumentCannotBeNullOrEmpty");
-        }
-
-        /// <summary>
-        /// Value cannot be null or an empty string.
-        /// </summary>
-        internal static string FormatArgumentCannotBeNullOrEmpty()
-            => GetString("ArgumentCannotBeNullOrEmpty");
-
-        /// <summary>
-        /// {0} must be called on a background thread.
-        /// </summary>
-        internal static string ForegroundDispatcher_AssertBackgroundThread
-        {
-            get => GetString("ForegroundDispatcher_AssertBackgroundThread");
-        }
-
-        /// <summary>
-        /// {0} must be called on a background thread.
-        /// </summary>
-        internal static string FormatForegroundDispatcher_AssertBackgroundThread(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ForegroundDispatcher_AssertBackgroundThread"), p0);
-
-        /// <summary>
-        /// {0} must be called on the foreground thread.
-        /// </summary>
-        internal static string ForegroundDispatcher_AssertForegroundThread
-        {
-            get => GetString("ForegroundDispatcher_AssertForegroundThread");
-        }
-
-        /// <summary>
-        /// {0} must be called on the foreground thread.
-        /// </summary>
-        internal static string FormatForegroundDispatcher_AssertForegroundThread(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ForegroundDispatcher_AssertForegroundThread"), p0);
-
-        /// <summary>
-        /// The method
-        /// </summary>
-        internal static string ForegroundDispatcher_NoMethodNamePlaceholder
-        {
-            get => GetString("ForegroundDispatcher_NoMethodNamePlaceholder");
-        }
-
-        /// <summary>
-        /// The method
-        /// </summary>
-        internal static string FormatForegroundDispatcher_NoMethodNamePlaceholder()
-            => GetString("ForegroundDispatcher_NoMethodNamePlaceholder");
-
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
-                }
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources.resx b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources.resx
deleted file mode 100644
index fca5a30e158d..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Resources.resx
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
-    <value>Value cannot be null or an empty string.</value>
-  </data>
-  <data name="ForegroundDispatcher_AssertBackgroundThread" xml:space="preserve">
-    <value>{0} must be called on a background thread.</value>
-  </data>
-  <data name="ForegroundDispatcher_AssertForegroundThread" xml:space="preserve">
-    <value>{0} must be called on the foreground thread.</value>
-  </data>
-  <data name="ForegroundDispatcher_NoMethodNamePlaceholder" xml:space="preserve">
-    <value>The method</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SourceTextExtensions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SourceTextExtensions.cs
deleted file mode 100644
index efc74344d5ee..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SourceTextExtensions.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Text
-{
-    internal static class SourceTextExtensions
-    {
-        public static RazorSourceDocument GetRazorSourceDocument(this SourceText sourceText, string fileName)
-        {
-            if (sourceText == null)
-            {
-                throw new ArgumentNullException(nameof(sourceText));
-            }
-
-            var content = sourceText.ToString();
-
-            return RazorSourceDocument.Create(content, fileName);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperResolutionResult.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperResolutionResult.cs
deleted file mode 100644
index 0e8c7b19efc7..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperResolutionResult.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    public sealed class TagHelperResolutionResult
-    {
-        internal static TagHelperResolutionResult Empty = new TagHelperResolutionResult(Array.Empty<TagHelperDescriptor>(), Array.Empty<RazorDiagnostic>());
-
-        public TagHelperResolutionResult(IReadOnlyList<TagHelperDescriptor> descriptors, IReadOnlyList<RazorDiagnostic> diagnostics)
-        {
-            Descriptors = descriptors;
-            Diagnostics = diagnostics;
-        }
-
-        public IReadOnlyList<TagHelperDescriptor> Descriptors { get; }
-
-        public IReadOnlyList<RazorDiagnostic> Diagnostics { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperResolver.cs
deleted file mode 100644
index 4316f6ee3be9..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperResolver.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    internal abstract class TagHelperResolver : ILanguageService
-    {
-        public abstract Task<TagHelperResolutionResult> GetTagHelpersAsync(ProjectSnapshot project, CancellationToken cancellationToken = default);
-
-        protected virtual async Task<TagHelperResolutionResult> GetTagHelpersAsync(ProjectSnapshot project, RazorProjectEngine engine)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            if (engine == null)
-            {
-                throw new ArgumentNullException(nameof(engine));
-            }
-
-            if (project.WorkspaceProject == null)
-            {
-                return TagHelperResolutionResult.Empty;
-            }
-
-            var providers = engine.Engine.Features.OfType<ITagHelperDescriptorProvider>().ToArray();
-            if (providers.Length == 0)
-            {
-                return TagHelperResolutionResult.Empty;
-            }
-
-            var results = new List<TagHelperDescriptor>();
-            var context = TagHelperDescriptorProviderContext.Create(results);
-            context.ExcludeHidden = true;
-            context.IncludeDocumentation = true;
-
-            var compilation = await project.WorkspaceProject.GetCompilationAsync().ConfigureAwait(false);
-            if (CompilationTagHelperFeature.IsValidCompilation(compilation))
-            {
-                context.SetCompilation(compilation);
-            }
-
-            for (var i = 0; i < providers.Length; i++)
-            {
-                var provider = providers[i];
-                provider.Execute(context);
-            }
-
-            return new TagHelperResolutionResult(results, Array.Empty<RazorDiagnostic>());
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor/Properties/AssemblyInfo.cs
index 0de18b91dcfb..e585739ec566 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor/Properties/AssemblyInfo.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor/Properties/AssemblyInfo.cs
@@ -7,10 +7,4 @@
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Remote.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.RazorExtension, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj
deleted file mode 100644
index 369dd8202089..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure.</Description>
-    <TargetFrameworks>net46</TargetFrameworks>
-    <EnableApiCheck>false</EnableApiCheck>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Microsoft.VisualStudio.LanguageServices.Razor\Serialization\*.cs">
-      <Link>Serialization\%(FileName)%(Extension)</Link>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.CodeAnalysis.Razor.Workspaces\Microsoft.CodeAnalysis.Razor.Workspaces.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(VSIX_MicrosoftCodeAnalysisCSharpPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(VSIX_MicrosoftCodeAnalysisCommonPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Remote.Razor.ServiceHub" Version="$(VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion)" />
-    <PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Properties/AssemblyInfo.cs
deleted file mode 100644
index fd7f2d2f87ce..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Remote.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs
deleted file mode 100644
index 16ababe0db7f..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.CodeAnalysis.Remote.Razor
-{
-    internal class RazorLanguageService : RazorServiceBase
-    {
-        public RazorLanguageService(Stream stream, IServiceProvider serviceProvider)
-            : base(stream, serviceProvider)
-        {
-        }
-
-        public async Task<TagHelperResolutionResult> GetTagHelpersAsync(ProjectSnapshotHandle projectHandle, string factoryTypeName, CancellationToken cancellationToken = default)
-        {
-            var project = await GetProjectSnapshotAsync(projectHandle, cancellationToken).ConfigureAwait(false);
-
-            return await RazorServices.TagHelperResolver.GetTagHelpersAsync(project, factoryTypeName, cancellationToken);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RazorServiceBase.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RazorServiceBase.cs
deleted file mode 100644
index 289d75cc0f60..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RazorServiceBase.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.CodeAnalysis.Remote.Razor
-{
-    internal abstract class RazorServiceBase : ServiceHubServiceBase
-    {
-        public RazorServiceBase(Stream stream, IServiceProvider serviceProvider)
-            : base(serviceProvider, stream)
-        {
-            RazorServices = new RazorServices();
-
-            Rpc.JsonSerializer.Converters.RegisterRazorConverters();
-
-            // Due to this issue - https://github.com/dotnet/roslyn/issues/16900#issuecomment-277378950
-            // We need to manually start the RPC connection. Otherwise we'd be opting ourselves into 
-            // race condition prone call paths.
-            Rpc.StartListening();
-        }
-
-        protected RazorServices RazorServices { get; }
-
-        protected virtual async Task<ProjectSnapshot> GetProjectSnapshotAsync(ProjectSnapshotHandle projectHandle, CancellationToken cancellationToken)
-        {
-            if (projectHandle == null)
-            {
-                throw new ArgumentNullException(nameof(projectHandle));
-            }
-
-            var solution = await GetSolutionAsync(cancellationToken).ConfigureAwait(false);
-            var workspaceProject = solution.GetProject(projectHandle.WorkspaceProjectId);
-
-            return new SerializedProjectSnapshot(projectHandle.FilePath, projectHandle.Configuration, workspaceProject);
-        }
-
-        private class SerializedProjectSnapshot : ProjectSnapshot
-        {
-            public SerializedProjectSnapshot(string filePath, RazorConfiguration configuration, Project workspaceProject)
-            {
-                FilePath = filePath;
-                Configuration = configuration;
-                WorkspaceProject = workspaceProject;
-
-                IsInitialized = true;
-                Version = VersionStamp.Default;
-            }
-
-            public override RazorConfiguration Configuration { get; }
-
-            public override IEnumerable<string> DocumentFilePaths => Array.Empty<string>();
-
-            public override string FilePath { get; }
-
-            public override bool IsInitialized { get; }
-
-            public override VersionStamp Version { get; }
-
-            public override Project WorkspaceProject { get; }
-
-            public override DocumentSnapshot GetDocument(string filePath)
-            {
-                if (filePath == null)
-                {
-                    throw new ArgumentNullException(nameof(filePath));
-                }
-
-                return null;
-            }
-
-            public override RazorProjectEngine GetProjectEngine()
-            {
-                throw new NotImplementedException();
-            }
-
-            public override Task<IReadOnlyList<TagHelperDescriptor>> GetTagHelpersAsync()
-            {
-                throw new NotImplementedException();
-            }
-
-            public override bool TryGetTagHelpers(out IReadOnlyList<TagHelperDescriptor> result)
-            {
-                throw new NotImplementedException();
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RazorServices.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RazorServices.cs
deleted file mode 100644
index d3a60a400c88..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RazorServices.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    // Provides access to Razor language and workspace services that are avialable in the OOP host.
-    //
-    // Since we don't have access to the workspace we only have access to some specific things
-    // that we can construct directly.
-    internal class RazorServices
-    {
-        public RazorServices()
-        {
-            FallbackProjectEngineFactory = new FallbackProjectEngineFactory();
-            TagHelperResolver = new RemoteTagHelperResolver(FallbackProjectEngineFactory);
-        }
-
-        public IFallbackProjectEngineFactory FallbackProjectEngineFactory { get; }
-
-        public RemoteTagHelperResolver TagHelperResolver { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RemoteTagHelperResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RemoteTagHelperResolver.cs
deleted file mode 100644
index f4ccaf775505..000000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RemoteTagHelperResolver.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    internal class RemoteTagHelperResolver : TagHelperResolver
-    {
-        private readonly static RazorConfiguration DefaultConfiguration = FallbackRazorConfiguration.MVC_2_0;
-
-        private readonly IFallbackProjectEngineFactory _fallbackFactory;
-
-        public RemoteTagHelperResolver(IFallbackProjectEngineFactory fallbackFactory)
-        {
-            if (fallbackFactory == null)
-            {
-                throw new ArgumentNullException(nameof(fallbackFactory));
-            }
-
-            _fallbackFactory = fallbackFactory;
-        }
-
-        public override Task<TagHelperResolutionResult> GetTagHelpersAsync(ProjectSnapshot project, CancellationToken cancellationToken = default)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<TagHelperResolutionResult> GetTagHelpersAsync(ProjectSnapshot project, string factoryTypeName, CancellationToken cancellationToken = default)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            if (project.Configuration == null || project.WorkspaceProject == null)
-            {
-                return Task.FromResult(TagHelperResolutionResult.Empty);
-            }
-
-            var engine = CreateProjectEngine(project, factoryTypeName);
-            return GetTagHelpersAsync(project, engine);
-        }
-
-        internal RazorProjectEngine CreateProjectEngine(ProjectSnapshot project, string factoryTypeName)
-        {
-            // This section is really similar to the code DefaultProjectEngineFactoryService
-            // but with a few differences that are significant in the remote scenario
-            //
-            // Most notably, we are going to find the Tag Helpers using a compilation, and we have
-            // no editor settings.
-            //
-            // The default configuration currently matches MVC-2.0. Beyond MVC-2.0 we added SDK support for 
-            // properly detecting project versions, so that's a good version to assume when we can't find a
-            // configuration.
-            var configuration = project?.Configuration ?? DefaultConfiguration;
-
-            // If there's no factory to handle the configuration then fall back to a very basic configuration.
-            //
-            // This will stop a crash from happening in this case (misconfigured project), but will still make
-            // it obvious to the user that something is wrong.
-            var factory = CreateFactory(configuration, factoryTypeName) ?? _fallbackFactory;
-            return factory.Create(configuration, RazorProjectFileSystem.Empty, b => { });
-        }
-
-        private IProjectEngineFactory CreateFactory(RazorConfiguration configuration, string factoryTypeName)
-        {
-            if (factoryTypeName == null)
-            {
-                return null;
-            }
-
-            return (IProjectEngineFactory)Activator.CreateInstance(Type.GetType(factoryTypeName, throwOnError: true));
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/AcceptedCharacters.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/AcceptedCharacters.cs
deleted file mode 100644
index 1d9ba282e9ba..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/AcceptedCharacters.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [Flags]
-    public enum AcceptedCharacters
-    {
-        None = 0,
-        NewLine = 1,
-        WhiteSpace = 2,
-
-        NonWhiteSpace = 4,
-
-        AllWhiteSpace = NewLine | WhiteSpace,
-        Any = AllWhiteSpace | NonWhiteSpace,
-
-        AnyExceptNewline = NonWhiteSpace | WhiteSpace
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/AttributeCompletionContext.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/AttributeCompletionContext.cs
deleted file mode 100644
index 08b4ffe03253..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/AttributeCompletionContext.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class AttributeCompletionContext
-    {
-        public AttributeCompletionContext(
-            TagHelperDocumentContext documentContext,
-            IEnumerable<string> existingCompletions,
-            string currentTagName,
-            string currentAttributeName,
-            IEnumerable<KeyValuePair<string, string>> attributes,
-            string currentParentTagName,
-            bool currentParentIsTagHelper,
-            Func<string, bool> inHTMLSchema)
-        {
-            if (documentContext == null)
-            {
-                throw new ArgumentNullException(nameof(documentContext));
-            }
-
-            if (existingCompletions == null)
-            {
-                throw new ArgumentNullException(nameof(existingCompletions));
-            }
-
-            if (currentTagName == null)
-            {
-                throw new ArgumentNullException(nameof(currentTagName));
-            }
-
-            if (attributes == null)
-            {
-                throw new ArgumentNullException(nameof(attributes));
-            }
-
-            if (inHTMLSchema == null)
-            {
-                throw new ArgumentNullException(nameof(inHTMLSchema));
-            }
-
-            DocumentContext = documentContext;
-            ExistingCompletions = existingCompletions;
-            CurrentTagName = currentTagName;
-            CurrentAttributeName = currentAttributeName;
-            Attributes = attributes;
-            CurrentParentTagName = currentParentTagName;
-            CurrentParentIsTagHelper = currentParentIsTagHelper;
-            InHTMLSchema = inHTMLSchema;
-        }
-
-        public TagHelperDocumentContext DocumentContext { get; }
-
-        public IEnumerable<string> ExistingCompletions { get; }
-
-        public string CurrentTagName { get; }
-
-        public string CurrentAttributeName { get; }
-
-        public IEnumerable<KeyValuePair<string, string>> Attributes { get; }
-
-        public string CurrentParentTagName { get; }
-
-        public bool CurrentParentIsTagHelper { get; }
-
-        public Func<string, bool> InHTMLSchema { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/AttributeCompletionResult.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/AttributeCompletionResult.cs
deleted file mode 100644
index c6a11d67ed98..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/AttributeCompletionResult.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public abstract class AttributeCompletionResult
-    {
-        private AttributeCompletionResult()
-        {
-        }
-
-        public abstract IReadOnlyDictionary<string, IEnumerable<BoundAttributeDescriptor>> Completions { get; }
-
-        internal static AttributeCompletionResult Create(Dictionary<string, HashSet<BoundAttributeDescriptor>> completions)
-        {
-            var readonlyCompletions = completions.ToDictionary(
-                key => key.Key,
-                value => (IEnumerable<BoundAttributeDescriptor>)value.Value,
-                completions.Comparer);
-            var result = new DefaultAttributeCompletionResult(readonlyCompletions);
-
-            return result;
-        }
-
-        private class DefaultAttributeCompletionResult : AttributeCompletionResult
-        {
-            private readonly IReadOnlyDictionary<string, IEnumerable<BoundAttributeDescriptor>> _completions;
-
-            public DefaultAttributeCompletionResult(IReadOnlyDictionary<string, IEnumerable<BoundAttributeDescriptor>> completions)
-            {
-                _completions = completions;
-            }
-
-            public override IReadOnlyDictionary<string, IEnumerable<BoundAttributeDescriptor>> Completions => _completions;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BackgroundParser.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BackgroundParser.cs
deleted file mode 100644
index 90f37f1273f8..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BackgroundParser.cs
+++ /dev/null
@@ -1,403 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal class BackgroundParser : IDisposable
-    {
-        private MainThreadState _main;
-        private BackgroundThread _bg;
-
-        public BackgroundParser(RazorProjectEngine projectEngine, string filePath, string projectDirectory)
-        {
-            _main = new MainThreadState(filePath);
-            _bg = new BackgroundThread(_main, projectEngine, filePath, projectDirectory);
-
-            _main.ResultsReady += (sender, args) => OnResultsReady(args);
-        }
-
-        /// <summary>
-        /// Fired on the main thread.
-        /// </summary>
-        public event EventHandler<BackgroundParserResultsReadyEventArgs> ResultsReady;
-
-        public bool IsIdle
-        {
-            get { return _main.IsIdle; }
-        }
-
-        public void Start()
-        {
-            _bg.Start();
-        }
-
-        public void Cancel()
-        {
-            _main.Cancel();
-        }
-
-        public ChangeReference QueueChange(SourceChange change, ITextSnapshot snapshot)
-        {
-            var changeReference = new ChangeReference(change, snapshot);
-            _main.QueueChange(changeReference);
-            return changeReference;
-        }
-
-        public void Dispose()
-        {
-            _main.Cancel();
-        }
-
-        public IDisposable SynchronizeMainThreadState()
-        {
-            return _main.Lock();
-        }
-
-        protected virtual void OnResultsReady(BackgroundParserResultsReadyEventArgs args)
-        {
-            using (SynchronizeMainThreadState())
-            {
-                ResultsReady?.Invoke(this, args);
-            }
-        }
-
-        private abstract class ThreadStateBase
-        {
-#if DEBUG
-            private int _id = -1;
-#endif
-            protected ThreadStateBase()
-            {
-            }
-
-            [Conditional("DEBUG")]
-            protected void SetThreadId(int id)
-            {
-#if DEBUG
-                _id = id;
-#endif
-            }
-
-            [Conditional("DEBUG")]
-            protected void EnsureOnThread()
-            {
-#if DEBUG
-                Debug.Assert(_id != -1, "SetThreadId was never called!");
-                Debug.Assert(Thread.CurrentThread.ManagedThreadId == _id, "Called from an unexpected thread!");
-#endif
-            }
-
-            [Conditional("DEBUG")]
-            protected void EnsureNotOnThread()
-            {
-#if DEBUG
-                Debug.Assert(_id != -1, "SetThreadId was never called!");
-                Debug.Assert(Thread.CurrentThread.ManagedThreadId != _id, "Called from an unexpected thread!");
-#endif
-            }
-        }
-
-        private class MainThreadState : ThreadStateBase, IDisposable
-        {
-            private readonly CancellationTokenSource _cancelSource = new CancellationTokenSource();
-            private readonly ManualResetEventSlim _hasParcel = new ManualResetEventSlim(false);
-            private CancellationTokenSource _currentParcelCancelSource;
-
-            private string _fileName;
-            private readonly object _stateLock = new object();
-            private IList<ChangeReference> _changes = new List<ChangeReference>();
-
-            public MainThreadState(string fileName)
-            {
-                _fileName = fileName;
-
-                SetThreadId(Thread.CurrentThread.ManagedThreadId);
-            }
-
-            public event EventHandler<BackgroundParserResultsReadyEventArgs> ResultsReady;
-
-            public CancellationToken CancelToken
-            {
-                get { return _cancelSource.Token; }
-            }
-
-            public bool IsIdle
-            {
-                get
-                {
-                    lock (_stateLock)
-                    {
-                        return _currentParcelCancelSource == null;
-                    }
-                }
-            }
-
-            public void Cancel()
-            {
-                EnsureOnThread();
-                _cancelSource.Cancel();
-            }
-
-            public IDisposable Lock()
-            {
-                Monitor.Enter(_stateLock);
-                return new DisposableAction(() => Monitor.Exit(_stateLock));
-            }
-
-            public void QueueChange(ChangeReference change)
-            {
-                // Any thread can queue a change.
-
-                lock (_stateLock)
-                {
-                    // CurrentParcel token source is not null ==> There's a parse underway
-                    if (_currentParcelCancelSource != null)
-                    {
-                        _currentParcelCancelSource.Cancel();
-                    }
-
-                    _changes.Add(change);
-                    _hasParcel.Set();
-                }
-            }
-
-            public WorkParcel GetParcel()
-            {
-                EnsureNotOnThread(); // Only the background thread can get a parcel
-                _hasParcel.Wait(_cancelSource.Token);
-                _hasParcel.Reset();
-                lock (_stateLock)
-                {
-                    // Create a cancellation source for this parcel
-                    _currentParcelCancelSource = new CancellationTokenSource();
-
-                    var changes = _changes;
-                    _changes = new List<ChangeReference>();
-                    return new WorkParcel(changes, _currentParcelCancelSource.Token);
-                }
-            }
-
-            public void ReturnParcel(BackgroundParserResultsReadyEventArgs args)
-            {
-                lock (_stateLock)
-                {
-                    // Clear the current parcel cancellation source
-                    if (_currentParcelCancelSource != null)
-                    {
-                        _currentParcelCancelSource.Dispose();
-                        _currentParcelCancelSource = null;
-                    }
-
-                    // If there are things waiting to be parsed, just don't fire the event because we're already out of date
-                    if (_changes.Any())
-                    {
-                        return;
-                    }
-                }
-                var handler = ResultsReady;
-                if (handler != null)
-                {
-                    handler(this, args);
-                }
-            }
-
-            public void Dispose()
-            {
-                Dispose(true);
-                GC.SuppressFinalize(this);
-            }
-
-            protected virtual void Dispose(bool disposing)
-            {
-                if (disposing)
-                {
-                    if (_currentParcelCancelSource != null)
-                    {
-                        _currentParcelCancelSource.Dispose();
-                        _currentParcelCancelSource = null;
-                    }
-                    _cancelSource.Dispose();
-                    _hasParcel.Dispose();
-                }
-            }
-        }
-
-        private class BackgroundThread : ThreadStateBase
-        {
-            private readonly string _filePath;
-            private readonly string _relativeFilePath;
-            private readonly string _projectDirectory;
-            private MainThreadState _main;
-            private Thread _backgroundThread;
-            private CancellationToken _shutdownToken;
-            private RazorProjectEngine _projectEngine;
-            private RazorSyntaxTree _currentSyntaxTree;
-            private IList<ChangeReference> _previouslyDiscarded = new List<ChangeReference>();
-
-            public BackgroundThread(MainThreadState main, RazorProjectEngine projectEngine, string filePath, string projectDirectory)
-            {
-                // Run on MAIN thread!
-                _main = main;
-                _shutdownToken = _main.CancelToken;
-                _projectEngine = projectEngine;
-                _filePath = filePath;
-                _relativeFilePath = GetNormalizedRelativeFilePath(filePath, projectDirectory);
-                _projectDirectory = projectDirectory;
-                _backgroundThread = new Thread(WorkerLoop);
-                SetThreadId(_backgroundThread.ManagedThreadId);
-            }
-
-            // **** ANY THREAD ****
-            public void Start()
-            {
-                _backgroundThread.Start();
-            }
-
-            // **** BACKGROUND THREAD ****
-            private void WorkerLoop()
-            {
-                try
-                {
-                    EnsureOnThread();
-
-                    while (!_shutdownToken.IsCancellationRequested)
-                    {
-                        // Grab the parcel of work to do
-                        var parcel = _main.GetParcel();
-                        if (parcel.Changes.Any())
-                        {
-                            try
-                            {
-                                BackgroundParserResultsReadyEventArgs args = null;
-                                using (var linkedCancel = CancellationTokenSource.CreateLinkedTokenSource(_shutdownToken, parcel.CancelToken))
-                                {
-                                    if (!linkedCancel.IsCancellationRequested)
-                                    {
-                                        // Collect ALL changes
-                                        List<ChangeReference> allChanges;
-
-                                        if (_previouslyDiscarded != null)
-                                        {
-                                            allChanges = Enumerable.Concat(_previouslyDiscarded, parcel.Changes).ToList();
-                                        }
-                                        else
-                                        {
-                                            allChanges = parcel.Changes.ToList();
-                                        }
-
-                                        var finalChange = allChanges.Last();
-
-                                        var results = ParseChange(finalChange.Snapshot, linkedCancel.Token);
-
-                                        if (results != null && !linkedCancel.IsCancellationRequested)
-                                        {
-                                            // Clear discarded changes list
-                                            _previouslyDiscarded = null;
-
-                                            _currentSyntaxTree = results.GetSyntaxTree();
-
-                                            // Build Arguments
-                                            args = new BackgroundParserResultsReadyEventArgs(finalChange, results);
-                                        }
-                                        else
-                                        {
-                                            // Parse completed but we were cancelled in the mean time. Add these to the discarded changes set
-                                            _previouslyDiscarded = allChanges;
-                                        }
-                                    }
-                                }
-                                if (args != null)
-                                {
-                                    _main.ReturnParcel(args);
-                                }
-                            }
-                            catch (OperationCanceledException)
-                            {
-                            }
-                        }
-                        else
-                        {
-                            Thread.Yield();
-                        }
-                    }
-                }
-                catch (OperationCanceledException)
-                {
-                    // Do nothing. Just shut down.
-                }
-                finally
-                {
-                    // Clean up main thread resources
-                    _main.Dispose();
-                }
-            }
-
-            private RazorCodeDocument ParseChange(ITextSnapshot snapshot, CancellationToken token)
-            {
-                EnsureOnThread();
-
-                var projectItem = new TextSnapshotProjectItem(snapshot, _projectDirectory, _relativeFilePath, _filePath);
-                var codeDocument = _projectEngine.ProcessDesignTime(projectItem);
-
-                return codeDocument;
-            }
-
-            private string GetNormalizedRelativeFilePath(string filePath, string projectDirectory)
-            {
-                if (filePath.StartsWith(projectDirectory, StringComparison.OrdinalIgnoreCase))
-                {
-                    filePath = filePath.Substring(projectDirectory.Length);
-                }
-
-                if (filePath.Length > 1)
-                {
-                    filePath = filePath.Replace('\\', '/');
-
-                    if (filePath[0] != '/')
-                    {
-                        filePath = "/" + filePath;
-                    }
-                }
-
-                return filePath;
-            }
-        }
-
-        private class WorkParcel
-        {
-            public WorkParcel(IList<ChangeReference> changes, CancellationToken cancelToken)
-            {
-                Changes = changes;
-                CancelToken = cancelToken;
-            }
-
-            public CancellationToken CancelToken { get; }
-
-            public IList<ChangeReference> Changes { get; }
-        }
-
-        internal class ChangeReference
-        {
-            public ChangeReference(SourceChange change, ITextSnapshot snapshot)
-            {
-                Change = change;
-                Snapshot = snapshot;
-            }
-
-            public SourceChange Change { get; }
-
-            public ITextSnapshot Snapshot { get; }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BackgroundParserResultsReadyEventArgs.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BackgroundParserResultsReadyEventArgs.cs
deleted file mode 100644
index ecb9cef76ed3..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BackgroundParserResultsReadyEventArgs.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using static Microsoft.VisualStudio.Editor.Razor.BackgroundParser;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal class BackgroundParserResultsReadyEventArgs : EventArgs
-    {
-        public BackgroundParserResultsReadyEventArgs(ChangeReference edit, RazorCodeDocument codeDocument)
-        {
-            ChangeReference = edit;
-            CodeDocument = codeDocument;
-        }
-
-        public ChangeReference ChangeReference { get; }
-
-        public RazorCodeDocument CodeDocument { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BlockKind.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BlockKind.cs
deleted file mode 100644
index 255923132961..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BlockKind.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public enum BlockKind
-    {
-        // Code
-        Statement,
-        Directive,
-        Functions,
-        Expression,
-        Helper,
-
-        // Markup
-        Markup,
-        Section,
-        Template,
-
-        // Special
-        Comment,
-        Tag,
-
-        HtmlComment
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenter.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenter.cs
deleted file mode 100644
index 4de857b9667d..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenter.cs
+++ /dev/null
@@ -1,350 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Text;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.Text.Operations;
-using ITextBuffer = Microsoft.VisualStudio.Text.ITextBuffer;
-using Span = Microsoft.AspNetCore.Razor.Language.Legacy.Span;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    /// <summary>
-    /// This class is responsible for handling situations where Roslyn and the HTML editor cannot auto-indent Razor code.
-    /// </summary>
-    /// <example>
-    /// Attempting to insert a newline (pipe indicates the cursor):
-    /// @{ |}
-    /// Should result in the text buffer looking like the following:
-    /// @{
-    ///     |
-    /// }
-    /// This is also true for directive block scenarios.
-    /// </example>
-    internal class BraceSmartIndenter : IDisposable
-    {
-        private readonly ForegroundDispatcher _dispatcher;
-        private readonly ITextBuffer _textBuffer;
-        private readonly VisualStudioDocumentTracker _documentTracker;
-        private readonly TextBufferCodeDocumentProvider _codeDocumentProvider;
-        private readonly IEditorOperationsFactoryService _editorOperationsFactory;
-        private readonly StringBuilder _indentBuilder = new StringBuilder();
-        private BraceIndentationContext _context;
-
-        // Internal for testing
-        internal BraceSmartIndenter()
-        {
-        }
-
-        public BraceSmartIndenter(
-            ForegroundDispatcher dispatcher,
-            VisualStudioDocumentTracker documentTracker,
-            TextBufferCodeDocumentProvider codeDocumentProvider,
-            IEditorOperationsFactoryService editorOperationsFactory)
-        {
-            if (dispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(dispatcher));
-            }
-
-            if (documentTracker == null)
-            {
-                throw new ArgumentNullException(nameof(documentTracker));
-            }
-
-            if (codeDocumentProvider == null)
-            {
-                throw new ArgumentNullException(nameof(codeDocumentProvider));
-            }
-
-            if (editorOperationsFactory == null)
-            {
-                throw new ArgumentNullException(nameof(editorOperationsFactory));
-            }
-
-            _dispatcher = dispatcher;
-            _documentTracker = documentTracker;
-            _codeDocumentProvider = codeDocumentProvider;
-            _editorOperationsFactory = editorOperationsFactory;
-            _textBuffer = _documentTracker.TextBuffer;
-            _textBuffer.Changed += TextBuffer_OnChanged;
-            _textBuffer.PostChanged += TextBuffer_OnPostChanged;
-        }
-
-        public void Dispose()
-        {
-            _dispatcher.AssertForegroundThread();
-
-            _textBuffer.Changed -= TextBuffer_OnChanged;
-            _textBuffer.PostChanged -= TextBuffer_OnPostChanged;
-        }
-
-        // Internal for testing
-        internal void TriggerSmartIndent(ITextView textView)
-        {
-            // This forces the smart indent. For example attempting to enter a newline between the functions directive:
-            // @functions {} will not auto-indent in between the braces unless we forcefully move to end of line.
-            var editorOperations = _editorOperationsFactory.GetEditorOperations(textView);
-            editorOperations.MoveToEndOfLine(false);
-        }
-
-        // Internal for testing
-        internal void TextBuffer_OnChanged(object sender, TextContentChangedEventArgs args)
-        {
-            _dispatcher.AssertForegroundThread();
-
-            if (!args.TextChangeOccurred(out var changeInformation))
-            {
-                return;
-            }
-
-            var newText = changeInformation.newText;
-            if (!_codeDocumentProvider.TryGetFromBuffer(_documentTracker.TextBuffer, out var codeDocument))
-            {
-                // Parse not available.
-                return;
-            }
-
-            var syntaxTree = codeDocument.GetSyntaxTree();
-            if (TryCreateIndentationContext(changeInformation.firstChange.NewPosition, newText.Length, newText, syntaxTree, _documentTracker, out var context))
-            {
-                _context = context;
-            }
-        }
-
-        private void TextBuffer_OnPostChanged(object sender, EventArgs e)
-        {
-            _dispatcher.AssertForegroundThread();
-
-            var context = _context;
-            _context = null;
-
-            if (context != null)
-            {
-                // Save the current caret position
-                var textView = context.FocusedTextView;
-                var caret = textView.Caret.Position.BufferPosition;
-                var textViewBuffer = textView.TextBuffer;
-                var indent = CalculateIndent(textViewBuffer, context.ChangePosition);
-
-                // Current state, pipe is cursor:
-                // @{
-                // |}
-
-                // Insert the completion text, i.e. "\r\n      "
-                InsertIndent(caret.Position, indent, textViewBuffer);
-
-                // @{
-                // 
-                // |}
-
-                // Place the caret inbetween the braces (before our indent).
-                RestoreCaretTo(caret.Position, textView);
-
-                // @{
-                // |
-                // }
-
-                // For Razor metacode cases the editor's smart indent wont kick in automatically. 
-                TriggerSmartIndent(textView);
-
-                // @{
-                //     |
-                // }
-            }
-        }
-
-        private string CalculateIndent(ITextBuffer buffer, int from)
-        {
-            // Get the line text of the block start
-            var currentSnapshotPoint = new SnapshotPoint(buffer.CurrentSnapshot, from);
-            var line = buffer.CurrentSnapshot.GetLineFromPosition(currentSnapshotPoint);
-            var lineText = line.GetText();
-
-            // Gather up the indent from the start block
-            _indentBuilder.Append(line.GetLineBreakText());
-            foreach (var ch in lineText)
-            {
-                if (!char.IsWhiteSpace(ch))
-                {
-                    break;
-                }
-                _indentBuilder.Append(ch);
-            }
-
-            var indent = _indentBuilder.ToString();
-            _indentBuilder.Clear();
-
-            return indent;
-        }
-
-        // Internal for testing
-        internal static void InsertIndent(int insertLocation, string indent, ITextBuffer textBuffer)
-        {
-            var edit = textBuffer.CreateEdit();
-            edit.Insert(insertLocation, indent);
-            edit.Apply();
-        }
-
-        // Internal for testing
-        internal static void RestoreCaretTo(int caretPosition, ITextView textView)
-        {
-            var currentSnapshotPoint = new SnapshotPoint(textView.TextBuffer.CurrentSnapshot, caretPosition);
-            textView.Caret.MoveTo(currentSnapshotPoint);
-        }
-
-        // Internal for testing
-        internal static bool TryCreateIndentationContext(
-            int changePosition,
-            int changeLength,
-            string finalText,
-            RazorSyntaxTree syntaxTree,
-            VisualStudioDocumentTracker documentTracker,
-            out BraceIndentationContext context)
-        {
-            var focusedTextView = documentTracker.GetFocusedTextView();
-            if (focusedTextView != null && ParserHelpers.IsNewLine(finalText))
-            {
-                if (!AtApplicableRazorBlock(changePosition, syntaxTree))
-                {
-                    context = null;
-                    return false;
-                }
-
-                var currentSnapshot = documentTracker.TextBuffer.CurrentSnapshot;
-                var preChangeLineSnapshot = currentSnapshot.GetLineFromPosition(changePosition);
-
-                // Handle the case where the \n comes through separately from the \r and the position
-                // on the line is beyond what the GetText call above gives back.
-                var linePosition = Math.Min(preChangeLineSnapshot.Length, changePosition - preChangeLineSnapshot.Start) - 1;
-
-                if (AfterOpeningBrace(linePosition, preChangeLineSnapshot))
-                {
-                    var afterChangePosition = changePosition + changeLength;
-                    var afterChangeLineSnapshot = currentSnapshot.GetLineFromPosition(afterChangePosition);
-                    var afterChangeLinePosition = afterChangePosition - afterChangeLineSnapshot.Start;
-
-                    if (BeforeClosingBrace(afterChangeLinePosition, afterChangeLineSnapshot))
-                    {
-                        context = new BraceIndentationContext(focusedTextView, changePosition);
-                        return true;
-                    }
-                }
-            }
-
-            context = null;
-            return false;
-        }
-
-        // Internal for testing
-        internal static bool AtApplicableRazorBlock(int changePosition, RazorSyntaxTree syntaxTree)
-        {
-            // Our goal here is to return true when we're acting on code blocks that have all 
-            // whitespace content and are surrounded by metacode.
-            // Some examples:
-            // @functions { |}
-            // @section foo { |}
-            // @{ |}
-
-            var change = new SourceChange(changePosition, 0, string.Empty);
-            var owner = syntaxTree.Root.LocateOwner(change);
-
-            if (IsUnlinkedSpan(owner))
-            {
-                return false;
-            }
-
-            if (SurroundedByInvalidContent(owner))
-            {
-                return false;
-            }
-
-            if (ContainsInvalidContent(owner))
-            {
-                return false;
-            }
-
-            // Indentable content inside of a code block.
-            return true;
-        }
-
-        // Internal for testing
-        internal static bool ContainsInvalidContent(Span owner)
-        {
-            // We only support whitespace based content. Any non-whitespace content is an unkonwn to us
-            // in regards to indentation.
-            for (var i = 0; i < owner.Tokens.Count; i++)
-            {
-                if (!string.IsNullOrWhiteSpace(owner.Tokens[i].Content))
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        // Internal for testing
-        internal static bool IsUnlinkedSpan(Span owner)
-        {
-            return owner == null ||
-                owner.Next == null ||
-                owner.Previous == null;
-        }
-
-        // Internal for testing
-        internal static bool SurroundedByInvalidContent(Span owner)
-        {
-            return owner.Next.Kind != SpanKindInternal.MetaCode ||
-                owner.Previous.Kind != SpanKindInternal.MetaCode;
-        }
-
-        internal static bool BeforeClosingBrace(int linePosition, ITextSnapshotLine lineSnapshot)
-        {
-            var lineText = lineSnapshot.GetText();
-            for (; linePosition < lineSnapshot.Length; linePosition++)
-            {
-                if (!char.IsWhiteSpace(lineText[linePosition]))
-                {
-                    break;
-                }
-            }
-
-            var beforeClosingBrace = linePosition < lineSnapshot.Length && lineText[linePosition] == '}';
-            return beforeClosingBrace;
-        }
-
-        internal static bool AfterOpeningBrace(int linePosition, ITextSnapshotLine lineSnapshot)
-        {
-            var lineText = lineSnapshot.GetText();
-            for (; linePosition >= 0; linePosition--)
-            {
-                if (!char.IsWhiteSpace(lineText[linePosition]))
-                {
-                    break;
-                }
-            }
-
-            var afterClosingBrace = linePosition >= 0 && lineText[linePosition] == '{';
-            return afterClosingBrace;
-        }
-
-        internal class BraceIndentationContext
-        {
-            public BraceIndentationContext(ITextView focusedTextView, int changePosition)
-            {
-                FocusedTextView = focusedTextView;
-                ChangePosition = changePosition;
-            }
-
-            public ITextView FocusedTextView { get; }
-
-            public int ChangePosition { get; }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenterFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenterFactory.cs
deleted file mode 100644
index 691181df6953..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenterFactory.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis.Host;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal abstract class BraceSmartIndenterFactory : ILanguageService
-    {
-        public abstract BraceSmartIndenter Create(VisualStudioDocumentTracker documentTracker);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BufferGraphExtensions.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BufferGraphExtensions.cs
deleted file mode 100644
index 1d16e0f0822c..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BufferGraphExtensions.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.ObjectModel;
-using Microsoft.VisualStudio.Text.Projection;
-
-namespace Microsoft.VisualStudio.Text
-{
-    internal static class BufferGraphExtensions
-    {
-        public static Collection<ITextBuffer> GetRazorBuffers(this IBufferGraph bufferGraph)
-        {
-            if (bufferGraph == null)
-            {
-                throw new ArgumentNullException(nameof(bufferGraph));
-            }
-
-            return bufferGraph.GetTextBuffers(TextBufferExtensions.IsRazorBuffer);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ClassifiedSpan.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ClassifiedSpan.cs
deleted file mode 100644
index dc066c8fce8c..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ClassifiedSpan.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public struct ClassifiedSpan
-    {
-        public ClassifiedSpan(SourceSpan span, SourceSpan blockSpan, SpanKind spanKind, BlockKind blockKind, AcceptedCharacters acceptedCharacters)
-        {
-            Span = span;
-            BlockSpan = blockSpan;
-            SpanKind = spanKind;
-            BlockKind = blockKind;
-            AcceptedCharacters = acceptedCharacters;
-        }
-
-        public AcceptedCharacters AcceptedCharacters { get; }
-
-        public BlockKind BlockKind { get; }
-
-        public SourceSpan BlockSpan { get; }
-
-        public SourceSpan Span { get; }
-
-        public SpanKind SpanKind { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ContextChangeEventArgs.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ContextChangeEventArgs.cs
deleted file mode 100644
index ad28406a15a6..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ContextChangeEventArgs.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public sealed class ContextChangeEventArgs : EventArgs
-    {
-        public ContextChangeEventArgs(ContextChangeKind kind)
-        {
-            Kind = kind;
-        }
-
-        public ContextChangeKind Kind { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ContextChangeKind.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ContextChangeKind.cs
deleted file mode 100644
index 2a9509967638..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ContextChangeKind.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public enum ContextChangeKind
-    {
-        ProjectChanged,
-        EditorSettingsChanged,
-        TagHelpersChanged,
-        ImportsChanged,
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultBraceSmartIndenterFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultBraceSmartIndenterFactory.cs
deleted file mode 100644
index 0b89592c56d2..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultBraceSmartIndenterFactory.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Text.Operations;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal class DefaultBraceSmartIndenterFactory : BraceSmartIndenterFactory
-    {
-        private readonly IEditorOperationsFactoryService _editorOperationsFactory;
-        private readonly ForegroundDispatcher _dispatcher;
-        private readonly TextBufferCodeDocumentProvider _codeDocumentProvider;
-
-        public DefaultBraceSmartIndenterFactory(
-            ForegroundDispatcher dispatcher,
-            TextBufferCodeDocumentProvider codeDocumentProvider,
-            IEditorOperationsFactoryService editorOperationsFactory)
-        {
-            if (dispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(dispatcher));
-            }
-
-            if (codeDocumentProvider == null)
-            {
-                throw new ArgumentNullException(nameof(codeDocumentProvider));
-            }
-
-            if (editorOperationsFactory == null)
-            {
-                throw new ArgumentNullException(nameof(editorOperationsFactory));
-            }
-
-            _dispatcher = dispatcher;
-            _codeDocumentProvider = codeDocumentProvider;
-            _editorOperationsFactory = editorOperationsFactory;
-        }
-
-        public override BraceSmartIndenter Create(VisualStudioDocumentTracker documentTracker)
-        {
-            if (documentTracker == null)
-            {
-                throw new ArgumentNullException(nameof(documentTracker));
-            }
-
-            _dispatcher.AssertForegroundThread();
-
-            var braceSmartIndenter = new BraceSmartIndenter(_dispatcher, documentTracker, _codeDocumentProvider, _editorOperationsFactory);
-
-            return braceSmartIndenter;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultBraceSmartIndenterFactoryFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultBraceSmartIndenterFactoryFactory.cs
deleted file mode 100644
index 2ca82e3cb535..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultBraceSmartIndenterFactoryFactory.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Text.Operations;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [Shared]
-    [ExportLanguageServiceFactory(typeof(BraceSmartIndenterFactory), RazorLanguage.Name, ServiceLayer.Default)]
-    internal class DefaultBraceSmartIndenterFactoryFactory : ILanguageServiceFactory
-    {
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly TextBufferCodeDocumentProvider _codeDocumentProvider;
-        private readonly IEditorOperationsFactoryService _editorOperationsFactory;
-
-        [ImportingConstructor]
-        public DefaultBraceSmartIndenterFactoryFactory(
-            ForegroundDispatcher foregroundDispatcher, 
-            TextBufferCodeDocumentProvider codeDocumentProvider, 
-            IEditorOperationsFactoryService editorOperationsFactory)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (codeDocumentProvider == null)
-            {
-                throw new ArgumentNullException(nameof(codeDocumentProvider));
-            }
-
-            if (editorOperationsFactory == null)
-            {
-                throw new ArgumentNullException(nameof(editorOperationsFactory));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _codeDocumentProvider = codeDocumentProvider;
-            _editorOperationsFactory = editorOperationsFactory;
-        }
-
-        public ILanguageService CreateLanguageService(HostLanguageServices languageServices)
-        {
-            if (languageServices == null)
-            {
-                throw new ArgumentNullException(nameof(languageServices));
-            }
-
-            return new DefaultBraceSmartIndenterFactory(_foregroundDispatcher, _codeDocumentProvider, _editorOperationsFactory);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultCodeDocumentProvider.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultCodeDocumentProvider.cs
deleted file mode 100644
index 61fafc8a847a..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultCodeDocumentProvider.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.ComponentModel.Composition;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(RazorCodeDocumentProvider))]
-    internal class DefaultCodeDocumentProvider : RazorCodeDocumentProvider
-    {
-        private readonly RazorTextBufferProvider _bufferProvider;
-        private readonly TextBufferCodeDocumentProvider _codeDocumentProvider;
-
-        [ImportingConstructor]
-        public DefaultCodeDocumentProvider(
-            RazorTextBufferProvider bufferProvider,
-            TextBufferCodeDocumentProvider codeDocumentProvider)
-        {
-            if (bufferProvider == null)
-            {
-                throw new ArgumentNullException(nameof(bufferProvider));
-            }
-
-            if (codeDocumentProvider == null)
-            {
-                throw new ArgumentNullException(nameof(codeDocumentProvider));
-            }
-
-            _bufferProvider = bufferProvider;
-            _codeDocumentProvider = codeDocumentProvider;
-        }
-
-        public override bool TryGetFromDocument(TextDocument document, out RazorCodeDocument codeDocument)
-        {
-            if (document == null)
-            {
-                throw new ArgumentNullException(nameof(document));
-            }
-
-            if (!_bufferProvider.TryGetFromDocument(document, out var textBuffer))
-            {
-                // Could not find a Razor buffer associated with the document.
-                codeDocument = null;
-                return false;
-            }
-
-            if (_codeDocumentProvider.TryGetFromBuffer(textBuffer, out codeDocument))
-            {
-                return true;
-            }
-
-            // A Razor code document has not yet been associated with the buffer yet.
-            codeDocument = null;
-            return false;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultEditorSettingsManager.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultEditorSettingsManager.cs
deleted file mode 100644
index cba58513084b..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultEditorSettingsManager.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.Editor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(EditorSettingsManager))]
-    internal class DefaultEditorSettingsManager : EditorSettingsManager
-    {
-        public override event EventHandler<EditorSettingsChangedEventArgs> Changed;
-
-        private readonly object SettingsAccessorLock = new object();
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private EditorSettings _settings;
-
-        [ImportingConstructor]
-        public DefaultEditorSettingsManager(ForegroundDispatcher foregroundDispatcher)
-        {
-            _foregroundDispatcher = foregroundDispatcher;
-            _settings = EditorSettings.Default;
-        }
-
-        public override EditorSettings Current
-        {
-            get
-            {
-                lock (SettingsAccessorLock)
-                {
-                    return _settings;
-                }
-            }
-        }
-
-        public override void Update(EditorSettings updatedSettings)
-        {
-            if (updatedSettings == null)
-            {
-                throw new ArgumentNullException(nameof(updatedSettings));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            lock (SettingsAccessorLock)
-            {
-                if (!_settings.Equals(updatedSettings))
-                {
-                    _settings = updatedSettings;
-                    OnChanged();
-                }
-            }
-        }
-
-        private void OnChanged()
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            var args = new EditorSettingsChangedEventArgs(Current);
-            Changed?.Invoke(this, args);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultImportDocumentManager.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultImportDocumentManager.cs
deleted file mode 100644
index b095cfdbb7dd..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultImportDocumentManager.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Editor.Razor.Documents;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal class DefaultImportDocumentManager : ImportDocumentManager
-    {
-        private readonly FileChangeTrackerFactory _fileChangeTrackerFactory;
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly ErrorReporter _errorReporter;
-        private readonly Dictionary<string, ImportTracker> _importTrackerCache;
-
-        public override event EventHandler<ImportChangedEventArgs> Changed;
-
-        public DefaultImportDocumentManager(
-            ForegroundDispatcher foregroundDispatcher,
-            ErrorReporter errorReporter,
-            FileChangeTrackerFactory fileChangeTrackerFactory)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (errorReporter == null)
-            {
-                throw new ArgumentNullException(nameof(errorReporter));
-            }
-
-            if (fileChangeTrackerFactory == null)
-            {
-                throw new ArgumentNullException(nameof(fileChangeTrackerFactory));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _errorReporter = errorReporter;
-            _fileChangeTrackerFactory = fileChangeTrackerFactory;
-            _importTrackerCache = new Dictionary<string, ImportTracker>(StringComparer.OrdinalIgnoreCase);
-        }
-
-        public override void OnSubscribed(VisualStudioDocumentTracker tracker)
-        {
-            if (tracker == null)
-            {
-                throw new ArgumentNullException(nameof(tracker));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            var imports = GetImportItems(tracker);
-            foreach (var import in imports)
-            {
-                var importFilePath = import.PhysicalPath;
-                Debug.Assert(importFilePath != null);
-
-                if (!_importTrackerCache.TryGetValue(importFilePath, out var importTracker))
-                {
-                    // First time seeing this import. Start tracking it.
-                    var fileChangeTracker = _fileChangeTrackerFactory.Create(importFilePath);
-                    importTracker = new ImportTracker(fileChangeTracker);
-                    _importTrackerCache[importFilePath] = importTracker;
-
-                    fileChangeTracker.Changed += FileChangeTracker_Changed;
-                    fileChangeTracker.StartListening();
-                }
-
-                importTracker.AssociatedDocuments.Add(tracker.FilePath);
-            }
-        }
-
-        public override void OnUnsubscribed(VisualStudioDocumentTracker tracker)
-        {
-            if (tracker == null)
-            {
-                throw new ArgumentNullException(nameof(tracker));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            var imports = GetImportItems(tracker);
-            foreach (var import in imports)
-            {
-                var importFilePath = import.PhysicalPath;
-                Debug.Assert(importFilePath != null);
-
-                if (_importTrackerCache.TryGetValue(importFilePath, out var importTracker))
-                {
-                    importTracker.AssociatedDocuments.Remove(tracker.FilePath);
-
-                    if (importTracker.AssociatedDocuments.Count == 0)
-                    {
-                        // There are no open documents that care about this import. We no longer need to track it.
-                        importTracker.FileChangeTracker.StopListening();
-                        _importTrackerCache.Remove(importFilePath);
-                    }
-                }
-            }
-        }
-
-        private IEnumerable<RazorProjectItem> GetImportItems(VisualStudioDocumentTracker tracker)
-        {
-            var projectEngine = tracker.ProjectSnapshot.GetProjectEngine();
-            var trackerItem = projectEngine.FileSystem.GetItem(tracker.FilePath);
-            var importFeature = projectEngine.ProjectFeatures.OfType<IImportProjectFeature>().FirstOrDefault();
-
-            // There should always be an import feature unless someone has misconfigured their RazorProjectEngine.
-            // In that case once we attempt to parse the Razor file we'll explode and give the a user a decent
-            // error message; for now, lets just be extra protective and assume 0 imports to not give a bad error.
-            var importItems = importFeature?.GetImports(trackerItem) ?? Enumerable.Empty<RazorProjectItem>();
-            var physicalImports = importItems.Where(import => import.FilePath != null);
-
-            return physicalImports;
-        }
-
-        private void OnChanged(ImportTracker importTracker, FileChangeKind changeKind)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (Changed == null)
-            {
-                return;
-            }
-
-            var args = new ImportChangedEventArgs(importTracker.FilePath, changeKind, importTracker.AssociatedDocuments);
-            Changed.Invoke(this, args);
-    }
-
-        private void FileChangeTracker_Changed(object sender, FileChangeEventArgs args)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (_importTrackerCache.TryGetValue(args.FilePath, out var importTracker))
-            {
-                OnChanged(importTracker, args.Kind);
-            }
-        }
-
-        private class ImportTracker
-        {
-            public ImportTracker(FileChangeTracker fileChangeTracker)
-            {
-                FileChangeTracker = fileChangeTracker;
-                AssociatedDocuments = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-            }
-
-            public string FilePath => FileChangeTracker.FilePath;
-
-            public FileChangeTracker FileChangeTracker { get; }
-
-            public HashSet<string> AssociatedDocuments { get; }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultImportDocumentManagerFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultImportDocumentManagerFactory.cs
deleted file mode 100644
index 1a0596d25e1d..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultImportDocumentManagerFactory.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Editor.Razor.Documents;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [Shared]
-    [ExportLanguageServiceFactory(typeof(ImportDocumentManager), RazorLanguage.Name, ServiceLayer.Default)]
-    internal class DefaultImportDocumentManagerFactory : ILanguageServiceFactory
-    {
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-
-        [ImportingConstructor]
-        public DefaultImportDocumentManagerFactory(ForegroundDispatcher foregroundDispatcher)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-        }
-
-        public ILanguageService CreateLanguageService(HostLanguageServices languageServices)
-        {
-            if (languageServices == null)
-            {
-                throw new ArgumentNullException(nameof(languageServices));
-            }
-
-            var errorReporter = languageServices.WorkspaceServices.GetRequiredService<ErrorReporter>();
-            var fileChangeTrackerFactory = languageServices.WorkspaceServices.GetRequiredService<FileChangeTrackerFactory>();
-
-            return new DefaultImportDocumentManager(_foregroundDispatcher, errorReporter, fileChangeTrackerFactory);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultProjectPathProvider.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultProjectPathProvider.cs
deleted file mode 100644
index 95f01de20137..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultProjectPathProvider.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal class DefaultProjectPathProvider : ProjectPathProvider
-    {
-        private readonly TextBufferProjectService _projectService;
-
-        public DefaultProjectPathProvider(TextBufferProjectService projectService)
-        {
-            if (projectService == null)
-            {
-                throw new ArgumentNullException(nameof(projectService));
-            }
-
-            _projectService = projectService;
-        }
-
-        public override bool TryGetProjectPath(ITextBuffer textBuffer, out string filePath)
-        {
-            if (textBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(textBuffer));
-            }
-
-            var project = _projectService.GetHostProject(textBuffer);
-            if (project == null)
-            {
-                filePath = null;
-                return false;
-            }
-
-            filePath = _projectService.GetProjectPath(project);
-            return true;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultProjectPathProviderFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultProjectPathProviderFactory.cs
deleted file mode 100644
index f425fd89d54a..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultProjectPathProviderFactory.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [Shared]
-    [ExportWorkspaceServiceFactory(typeof(ProjectPathProvider), ServiceLayer.Default)]
-    internal class DefaultProjectPathProviderFactory : IWorkspaceServiceFactory
-    {
-        private readonly TextBufferProjectService _projectService;
-        
-        [ImportingConstructor]
-        public DefaultProjectPathProviderFactory(TextBufferProjectService projectService)
-        {
-            if (projectService == null)
-            {
-                throw new ArgumentNullException(nameof(projectService));
-            }
-
-            _projectService = projectService;
-        }
-
-        public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
-        {
-            if (workspaceServices == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceServices));
-            }
-
-            return new DefaultProjectPathProvider(_projectService);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorDocumentManager.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorDocumentManager.cs
deleted file mode 100644
index 7ceda03678a5..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorDocumentManager.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using System.Diagnostics;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(RazorDocumentManager))]
-    internal class DefaultRazorDocumentManager : RazorDocumentManager
-    {
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly RazorEditorFactoryService _editorFactoryService;
-
-        [ImportingConstructor]
-        public DefaultRazorDocumentManager(
-            ForegroundDispatcher dispatcher,
-            RazorEditorFactoryService editorFactoryService)
-        {
-            if (dispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(dispatcher));
-            }
-
-            if (editorFactoryService == null)
-            {
-                throw new ArgumentNullException(nameof(editorFactoryService));
-            }
-
-            _foregroundDispatcher = dispatcher;
-            _editorFactoryService = editorFactoryService;
-        }
-
-        public override void OnTextViewOpened(ITextView textView, IEnumerable<ITextBuffer> subjectBuffers)
-        {
-            if (textView == null)
-            {
-                throw new ArgumentNullException(nameof(textView));
-            }
-
-            if (subjectBuffers == null)
-            {
-                throw new ArgumentNullException(nameof(subjectBuffers));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            foreach (var textBuffer in subjectBuffers)
-            {
-                if (!textBuffer.IsRazorBuffer())
-                {
-                    continue;
-                }
-
-                if (!_editorFactoryService.TryGetDocumentTracker(textBuffer, out var documentTracker) ||
-                    !(documentTracker is DefaultVisualStudioDocumentTracker tracker))
-                {
-                    Debug.Fail("Tracker should always be available given our expectations of the VS workflow.");
-                    return;
-                }
-
-                tracker.AddTextView(textView);
-
-                if (documentTracker.TextViews.Count == 1)
-                {
-                    tracker.Subscribe();
-                }
-            }
-        }
-
-        public override void OnTextViewClosed(ITextView textView, IEnumerable<ITextBuffer> subjectBuffers)
-        {
-            if (textView == null)
-            {
-                throw new ArgumentNullException(nameof(textView));
-            }
-
-            if (subjectBuffers == null)
-            {
-                throw new ArgumentNullException(nameof(subjectBuffers));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            // This means a Razor buffer has be detached from this ITextView or the ITextView is closing. Since we keep a 
-            // list of all of the open text views for each text buffer, we need to update the tracker.
-            //
-            // Notice that this method is called *after* changes are applied to the text buffer(s). We need to check every
-            // one of them for a tracker because the content type could have changed.
-            foreach (var textBuffer in subjectBuffers)
-            {
-                DefaultVisualStudioDocumentTracker documentTracker;
-                if (textBuffer.Properties.TryGetProperty(typeof(VisualStudioDocumentTracker), out documentTracker))
-                {
-                    documentTracker.RemoveTextView(textView);
-
-                    if (documentTracker.TextViews.Count == 0)
-                    {
-                        documentTracker.Unsubscribe();
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorEditorFactoryService.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorEditorFactoryService.cs
deleted file mode 100644
index 66f624d02d20..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorEditorFactoryService.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.ComponentModel.Composition;
-using System.Diagnostics;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(RazorEditorFactoryService))]
-    internal class DefaultRazorEditorFactoryService : RazorEditorFactoryService
-    {
-        private static readonly object RazorTextBufferInitializationKey = new object();
-        private readonly VisualStudioWorkspaceAccessor _workspaceAccessor;
-
-        [ImportingConstructor]
-        public DefaultRazorEditorFactoryService(VisualStudioWorkspaceAccessor workspaceAccessor)
-        {
-            if (workspaceAccessor == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceAccessor));
-            }
-
-            _workspaceAccessor = workspaceAccessor;
-        }
-
-        public override bool TryGetDocumentTracker(ITextBuffer textBuffer, out VisualStudioDocumentTracker documentTracker)
-        {
-            if (textBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(textBuffer));
-            }
-
-            if (!textBuffer.IsRazorBuffer())
-            {
-                documentTracker = null;
-                return false;
-            }
-
-            var textBufferInitialized = TryInitializeTextBuffer(textBuffer);
-            if (!textBufferInitialized)
-            {
-                documentTracker = null;
-                return false;
-            }
-
-            if (!textBuffer.Properties.TryGetProperty(typeof(VisualStudioDocumentTracker), out documentTracker))
-            {
-                Debug.Fail("Document tracker should have been stored on the text buffer during initialization.");
-                return false;
-            }
-
-            return true;
-        }
-
-        public override bool TryGetParser(ITextBuffer textBuffer, out VisualStudioRazorParser parser)
-        {
-            if (textBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(textBuffer));
-            }
-
-            if (!textBuffer.IsRazorBuffer())
-            {
-                parser = null;
-                return false;
-            }
-
-            var textBufferInitialized = TryInitializeTextBuffer(textBuffer);
-            if (!textBufferInitialized)
-            {
-                parser = null;
-                return false;
-            }
-
-            if (!textBuffer.Properties.TryGetProperty(typeof(VisualStudioRazorParser), out parser))
-            {
-                Debug.Fail("Parser should have been stored on the text buffer during initialization.");
-                return false;
-            }
-
-            return true;
-        }
-
-        internal override bool TryGetSmartIndenter(ITextBuffer textBuffer, out BraceSmartIndenter braceSmartIndenter)
-        {
-            if (textBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(textBuffer));
-            }
-
-            if (!textBuffer.IsRazorBuffer())
-            {
-                braceSmartIndenter = null;
-                return false;
-            }
-
-            var textBufferInitialized = TryInitializeTextBuffer(textBuffer);
-            if (!textBufferInitialized)
-            {
-                braceSmartIndenter = null;
-                return false;
-            }
-
-            if (!textBuffer.Properties.TryGetProperty(typeof(BraceSmartIndenter), out braceSmartIndenter))
-            {
-                Debug.Fail("Brace smart indenter should have been stored on the text buffer during initialization.");
-                return false;
-            }
-
-            return true;
-        }
-
-        // Internal for testing
-        internal bool TryInitializeTextBuffer(ITextBuffer textBuffer)
-        {
-            if (textBuffer.Properties.ContainsProperty(RazorTextBufferInitializationKey))
-            {
-                // Buffer already initialized.
-                return true;
-            }
-
-            if (!_workspaceAccessor.TryGetWorkspace(textBuffer, out var workspace))
-            {
-                // Could not locate workspace for given text buffer.
-                return false;
-            }
-
-            var razorLanguageServices = workspace.Services.GetLanguageServices(RazorLanguage.Name);
-            var documentTrackerFactory = razorLanguageServices.GetRequiredService<VisualStudioDocumentTrackerFactory>();
-            var parserFactory = razorLanguageServices.GetRequiredService<VisualStudioRazorParserFactory>();
-            var braceSmartIndenterFactory = razorLanguageServices.GetRequiredService<BraceSmartIndenterFactory>();
-
-            var tracker = documentTrackerFactory.Create(textBuffer);
-            textBuffer.Properties[typeof(VisualStudioDocumentTracker)] = tracker;
-
-            var parser = parserFactory.Create(tracker);
-            textBuffer.Properties[typeof(VisualStudioRazorParser)] = parser;
-
-            var braceSmartIndenter = braceSmartIndenterFactory.Create(tracker);
-            textBuffer.Properties[typeof(BraceSmartIndenter)] = braceSmartIndenter;
-
-            textBuffer.Properties.AddProperty(RazorTextBufferInitializationKey, RazorTextBufferInitializationKey);
-
-            return true;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorIndentationFactsService.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorIndentationFactsService.cs
deleted file mode 100644
index f69274fa1502..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorIndentationFactsService.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.ComponentModel.Composition;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Microsoft.VisualStudio.Text;
-using Span = Microsoft.AspNetCore.Razor.Language.Legacy.Span;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(RazorIndentationFactsService))]
-    internal class DefaultRazorIndentationFactsService : RazorIndentationFactsService
-    {
-        // This method dives down a syntax tree looking for open curly braces, every time
-        // it finds one it increments its indent until it finds the provided "line". 
-        // 
-        // Examples:
-        // @{
-        //    <strong>Hello World</strong>
-        // }
-        // Asking for desired indentation of the @{ or } lines should result in a desired indentation of 4.
-        //
-        // <div>
-        //     @{
-        //         <strong>Hello World</strong>
-        //     }
-        // </div>
-        // Asking for desired indentation of the @{ or } lines should result in a desired indentation of 8.
-        public override int? GetDesiredIndentation(
-            RazorSyntaxTree syntaxTree,
-            ITextSnapshot syntaxTreeSnapshot,
-            ITextSnapshotLine line,
-            int indentSize,
-            int tabSize)
-        {
-            if (syntaxTree == null)
-            {
-                throw new ArgumentNullException(nameof(syntaxTree));
-            }
-
-            if (syntaxTreeSnapshot == null)
-            {
-                throw new ArgumentNullException(nameof(syntaxTreeSnapshot));
-            }
-
-            if (line == null)
-            {
-                throw new ArgumentNullException(nameof(line));
-            }
-
-            if (indentSize < 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(indentSize));
-            }
-
-            if (tabSize < 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(tabSize));
-            }
-
-            var previousLineEndIndex = GetPreviousLineEndIndex(syntaxTreeSnapshot, line);
-            var simulatedChange = new SourceChange(previousLineEndIndex, 0, string.Empty);
-            var owningSpan = syntaxTree.Root.LocateOwner(simulatedChange);
-            if (owningSpan == null || owningSpan.Kind == SpanKindInternal.Code)
-            {
-                // Example,
-                // @{\n
-                //   ^  - The newline here is a code span and we should just let the default c# editor take care of indentation.
-
-                return null;
-            }
-
-            int? desiredIndentation = null;
-            SyntaxTreeNode owningChild = owningSpan;
-            while (owningChild.Parent != null)
-            {
-                var owningParent = owningChild.Parent;
-                for (var i = 0; i < owningParent.Children.Count; i++)
-                {
-                    var currentChild = owningParent.Children[i];
-                    if (IsCSharpOpenCurlyBrace(currentChild))
-                    {
-                        var lineText = line.Snapshot.GetLineFromLineNumber(currentChild.Start.LineIndex).GetText();
-                        desiredIndentation = GetIndentLevelOfLine(lineText, tabSize) + indentSize;
-                    }
-
-                    if (currentChild == owningChild)
-                    {
-                        break;
-                    }
-                }
-
-                if (desiredIndentation.HasValue)
-                {
-                    return desiredIndentation;
-                }
-
-                owningChild = owningParent;
-            }
-
-            // Couldn't determine indentation
-            return null;
-        }
-
-        // Internal for testing
-        internal int GetIndentLevelOfLine(string line, int tabSize)
-        {
-            var indentLevel = 0;
-
-            foreach (var c in line)
-            {
-                if (!char.IsWhiteSpace(c))
-                {
-                    break;
-                }
-                else if (c == '\t')
-                {
-                    indentLevel += tabSize;
-                }
-                else
-                {
-                    indentLevel++;
-                }
-            }
-
-            return indentLevel;
-        }
-
-        // Internal for testing
-        internal static int GetPreviousLineEndIndex(ITextSnapshot syntaxTreeSnapshot, ITextSnapshotLine line)
-        {
-            var previousLine = line.Snapshot.GetLineFromLineNumber(line.LineNumber - 1);
-            var trackingPoint = previousLine.Snapshot.CreateTrackingPoint(previousLine.End, PointTrackingMode.Negative);
-            var previousLineEndIndex = trackingPoint.GetPosition(syntaxTreeSnapshot);
-            return previousLineEndIndex;
-        }
-
-        // Internal for testing
-        internal static bool IsCSharpOpenCurlyBrace(SyntaxTreeNode currentChild)
-        {
-            return currentChild is Span currentSpan &&
-                currentSpan.Tokens.Count == 1 &&
-                currentSpan.Tokens[0] is CSharpToken symbol &&
-                symbol.Type == CSharpTokenType.LeftBrace;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorSyntaxFactsService.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorSyntaxFactsService.cs
deleted file mode 100644
index c5f3e2779a95..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorSyntaxFactsService.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(RazorSyntaxFactsService))]
-    internal class DefaultRazorSyntaxFactsService : RazorSyntaxFactsService
-    {
-        public override IReadOnlyList<ClassifiedSpan> GetClassifiedSpans(RazorSyntaxTree syntaxTree)
-        {
-            var result = syntaxTree.GetClassifiedSpans();
-            return result.Select(item =>
-            {
-                return new ClassifiedSpan(
-                    item.Span,
-                    item.BlockSpan,
-                    (SpanKind)item.SpanKind,
-                    (BlockKind)item.BlockKind,
-                    (AcceptedCharacters)item.AcceptedCharacters);
-            }).ToArray();
-        }
-
-        public override IReadOnlyList<TagHelperSpan> GetTagHelperSpans(RazorSyntaxTree syntaxTree)
-        {
-            var result = syntaxTree.GetTagHelperSpans();
-            return result.Select(item => new TagHelperSpan(item.Span, item.Binding)).ToArray();
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTagHelperCompletionService.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTagHelperCompletionService.cs
deleted file mode 100644
index 1c53c97a4454..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTagHelperCompletionService.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using System.Diagnostics;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(TagHelperCompletionService))]
-    internal class DefaultTagHelperCompletionService : TagHelperCompletionService
-    {
-        private readonly TagHelperFactsService _tagHelperFactsService;
-        private static readonly HashSet<TagHelperDescriptor> _emptyHashSet = new HashSet<TagHelperDescriptor>();
-
-        [ImportingConstructor]
-        public DefaultTagHelperCompletionService(TagHelperFactsService tagHelperFactsService)
-        {
-            if (tagHelperFactsService == null)
-            {
-                throw new ArgumentNullException(nameof(tagHelperFactsService));
-            }
-
-            _tagHelperFactsService = tagHelperFactsService;
-        }
-
-        // This API attempts to understand a users context as they're typing in a Razor file to provide TagHelper based attribute IntelliSense.
-        //
-        // Scenarios for TagHelper attribute IntelliSense follows:
-        // 1. TagHelperDescriptor's have matching required attribute names
-        //  -> Provide IntelliSense for the required attributes of those descriptors to lead users towards a TagHelperified element.
-        // 2. TagHelperDescriptor entirely applies to current element. Tag name, attributes, everything is fulfilled.
-        //  -> Provide IntelliSense for the bound attributes for the applied descriptors.
-        //
-        // Within each of the above scenarios if an attribute completion has a corresponding bound attribute we associate it with the corresponding
-        // BoundAttributeDescriptor. By doing this a user can see what C# type a TagHelper expects for the attribute.
-        public override AttributeCompletionResult GetAttributeCompletions(AttributeCompletionContext completionContext)
-        {
-            if (completionContext == null)
-            {
-                throw new ArgumentNullException(nameof(completionContext));
-            }
-
-            var attributeCompletions = completionContext.ExistingCompletions.ToDictionary(
-                completion => completion,
-                _ => new HashSet<BoundAttributeDescriptor>(),
-                StringComparer.OrdinalIgnoreCase);
-
-            var documentContext = completionContext.DocumentContext;
-            var descriptorsForTag = _tagHelperFactsService.GetTagHelpersGivenTag(documentContext, completionContext.CurrentTagName, completionContext.CurrentParentTagName);
-            if (descriptorsForTag.Count == 0)
-            {
-                // If the current tag has no possible descriptors then we can't have any additional attributes.
-                var defaultResult = AttributeCompletionResult.Create(attributeCompletions);
-                return defaultResult;
-            }
-
-            var prefix = documentContext.Prefix ?? string.Empty;
-            Debug.Assert(completionContext.CurrentTagName.StartsWith(prefix, StringComparison.OrdinalIgnoreCase));
-
-            var applicableTagHelperBinding = _tagHelperFactsService.GetTagHelperBinding(
-                documentContext,
-                completionContext.CurrentTagName,
-                completionContext.Attributes,
-                completionContext.CurrentParentTagName,
-                completionContext.CurrentParentIsTagHelper);
-
-            var applicableDescriptors = applicableTagHelperBinding?.Descriptors ?? Enumerable.Empty<TagHelperDescriptor>();
-            var unprefixedTagName = completionContext.CurrentTagName.Substring(prefix.Length);
-
-            if (!completionContext.InHTMLSchema(unprefixedTagName) &&
-                applicableDescriptors.All(descriptor => descriptor.TagOutputHint == null))
-            {
-                // This isn't a known HTML tag and no descriptor has an output element hint. Remove all previous completions.
-                attributeCompletions.Clear();
-            }
-
-            for (var i = 0; i < descriptorsForTag.Count; i++)
-            {
-                var descriptor = descriptorsForTag[i];
-
-                if (applicableDescriptors.Contains(descriptor))
-                {
-                    foreach (var attributeDescriptor in descriptor.BoundAttributes)
-                    {
-                        UpdateCompletions(attributeDescriptor.Name, attributeDescriptor);
-                    }
-                }
-                else
-                {
-                    var htmlNameToBoundAttribute = descriptor.BoundAttributes.ToDictionary(attribute => attribute.Name, StringComparer.OrdinalIgnoreCase);
-
-                    foreach (var rule in descriptor.TagMatchingRules)
-                    {
-                        foreach (var requiredAttribute in rule.Attributes)
-                        {
-                            if (htmlNameToBoundAttribute.TryGetValue(requiredAttribute.Name, out var attributeDescriptor))
-                            {
-                                UpdateCompletions(requiredAttribute.Name, attributeDescriptor);
-                            }
-                            else
-                            {
-                                UpdateCompletions(requiredAttribute.Name, possibleDescriptor: null);
-                            }
-                        }
-                    }
-                }
-            }
-
-            var completionResult = AttributeCompletionResult.Create(attributeCompletions);
-            return completionResult;
-
-            void UpdateCompletions(string attributeName, BoundAttributeDescriptor possibleDescriptor)
-            {
-                if (completionContext.Attributes.Any(attribute => string.Equals(attribute.Key, attributeName, StringComparison.OrdinalIgnoreCase)) &&
-                    (completionContext.CurrentAttributeName == null ||
-                    !string.Equals(attributeName, completionContext.CurrentAttributeName, StringComparison.OrdinalIgnoreCase)))
-                {
-                    // Attribute is already present on this element and it is not the attribute in focus.
-                    // It shouldn't exist in the completion list.
-                    return;
-                }
-
-                if (!attributeCompletions.TryGetValue(attributeName, out var rules))
-                {
-                    rules = new HashSet<BoundAttributeDescriptor>();
-                    attributeCompletions[attributeName] = rules;
-                }
-
-                if (possibleDescriptor != null)
-                {
-                    rules.Add(possibleDescriptor);
-                }
-            }
-        }
-
-        public override ElementCompletionResult GetElementCompletions(ElementCompletionContext completionContext)
-        {
-            if (completionContext == null)
-            {
-                throw new ArgumentNullException(nameof(completionContext));
-            }
-
-            var elementCompletions = new Dictionary<string, HashSet<TagHelperDescriptor>>(StringComparer.OrdinalIgnoreCase);
-
-            AddAllowedChildrenCompletions(completionContext, elementCompletions);
-
-            if (elementCompletions.Count > 0)
-            {
-                // If the containing element is already a TagHelper and only allows certain children.
-                var emptyResult = ElementCompletionResult.Create(elementCompletions);
-                return emptyResult;
-            }
-
-            elementCompletions = completionContext.ExistingCompletions.ToDictionary(
-                completion => completion,
-                _ => new HashSet<TagHelperDescriptor>(),
-                StringComparer.OrdinalIgnoreCase);
-
-            var catchAllDescriptors = new HashSet<TagHelperDescriptor>();
-            var prefix = completionContext.DocumentContext.Prefix ?? string.Empty;
-            var possibleChildDescriptors = _tagHelperFactsService.GetTagHelpersGivenParent(completionContext.DocumentContext, completionContext.ContainingTagName);
-            foreach (var possibleDescriptor in possibleChildDescriptors)
-            {
-                var addRuleCompletions = false;
-                var outputHint = possibleDescriptor.TagOutputHint;
-
-                foreach (var rule in possibleDescriptor.TagMatchingRules)
-                {
-                    if (!TagHelperMatchingConventions.SatisfiesParentTag(completionContext.ContainingTagName, rule))
-                    {
-                        continue;
-                    }
-
-                    if (rule.TagName == TagHelperMatchingConventions.ElementCatchAllName)
-                    {
-                        catchAllDescriptors.Add(possibleDescriptor);
-                    }
-                    else if (elementCompletions.ContainsKey(rule.TagName))
-                    {
-                        addRuleCompletions = true;
-                    }
-                    else if (outputHint != null)
-                    {
-                        // If the current descriptor has an output hint we need to make sure it shows up only when its output hint would normally show up.
-                        // Example: We have a MyTableTagHelper that has an output hint of "table" and a MyTrTagHelper that has an output hint of "tr".
-                        // If we try typing in a situation like this: <body > | </body>
-                        // We'd expect to only get "my-table" as a completion because the "body" tag doesn't allow "tr" tags.
-                        addRuleCompletions = elementCompletions.ContainsKey(outputHint);
-                    }
-                    else if (!completionContext.InHTMLSchema(rule.TagName))
-                    {
-                        // If there is an unknown HTML schema tag that doesn't exist in the current completion we should add it. This happens for
-                        // TagHelpers that target non-schema oriented tags.
-                        addRuleCompletions = true;
-                    }
-
-                    if (addRuleCompletions)
-                    {
-                        UpdateCompletions(prefix + rule.TagName, possibleDescriptor);
-                    }
-                }
-            }
-
-            // We needed to track all catch-alls and update their completions after all other completions have been completed.
-            // This way, any TagHelper added completions will also have catch-alls listed under their entries.
-            foreach (var catchAllDescriptor in catchAllDescriptors)
-            {
-                foreach (var completionTagName in elementCompletions.Keys)
-                {
-                    if (elementCompletions[completionTagName].Count > 0 ||
-                        !string.IsNullOrEmpty(prefix) && completionTagName.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
-                    {
-                        // The current completion either has other TagHelper's associated with it or is prefixed with a non-empty
-                        // TagHelper prefix.
-                        UpdateCompletions(completionTagName, catchAllDescriptor);
-                    }
-                }
-            }
-
-            var result = ElementCompletionResult.Create(elementCompletions);
-            return result;
-
-            void UpdateCompletions(string tagName, TagHelperDescriptor possibleDescriptor)
-            {
-                if (!elementCompletions.TryGetValue(tagName, out var existingRuleDescriptors))
-                {
-                    existingRuleDescriptors = new HashSet<TagHelperDescriptor>();
-                    elementCompletions[tagName] = existingRuleDescriptors;
-                }
-
-                existingRuleDescriptors.Add(possibleDescriptor);
-            }
-        }
-
-        private void AddAllowedChildrenCompletions(
-            ElementCompletionContext completionContext,
-            Dictionary<string, HashSet<TagHelperDescriptor>> elementCompletions)
-        {
-            if (completionContext.ContainingTagName == null)
-            {
-                // If we're at the root then there's no containing TagHelper to specify allowed children.
-                return;
-            }
-
-            var prefix = completionContext.DocumentContext.Prefix ?? string.Empty;
-
-            var binding = _tagHelperFactsService.GetTagHelperBinding(
-                completionContext.DocumentContext,
-                completionContext.ContainingTagName,
-                completionContext.Attributes,
-                completionContext.ContainingParentTagName,
-                completionContext.ContainingParentIsTagHelper);
-
-            if (binding == null)
-            {
-                // Containing tag is not a TagHelper; therefore, it allows any children.
-                return;
-            }
-
-            foreach (var descriptor in binding.Descriptors)
-            {
-                foreach (var childTag in descriptor.AllowedChildTags)
-                {
-                    var prefixedName = string.Concat(prefix, childTag.Name);
-                    var descriptors = _tagHelperFactsService.GetTagHelpersGivenTag(
-                        completionContext.DocumentContext,
-                        prefixedName,
-                        completionContext.ContainingTagName);
-
-                    if (descriptors.Count == 0)
-                    {
-                        if (!elementCompletions.ContainsKey(prefixedName))
-                        {
-                            elementCompletions[prefixedName] = _emptyHashSet;
-                        }
-
-                        continue;
-                    }
-
-                    if (!elementCompletions.TryGetValue(prefixedName, out var existingRuleDescriptors))
-                    {
-                        existingRuleDescriptors = new HashSet<TagHelperDescriptor>();
-                        elementCompletions[prefixedName] = existingRuleDescriptors;
-                    }
-
-                    existingRuleDescriptors.UnionWith(descriptors);
-                }
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTagHelperFactsService.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTagHelperFactsService.cs
deleted file mode 100644
index 1d23ce02317f..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTagHelperFactsService.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(TagHelperFactsService))]
-    internal class DefaultTagHelperFactsService : TagHelperFactsService
-    {
-        public override TagHelperBinding GetTagHelperBinding(
-            TagHelperDocumentContext documentContext,
-            string tagName,
-            IEnumerable<KeyValuePair<string, string>> attributes,
-            string parentTag,
-            bool parentIsTagHelper)
-        {
-            if (documentContext == null)
-            {
-                throw new ArgumentNullException(nameof(documentContext));
-            }
-
-            if (tagName == null)
-            {
-                throw new ArgumentNullException(nameof(tagName));
-            }
-
-            if (attributes == null)
-            {
-                throw new ArgumentNullException(nameof(attributes));
-            }
-
-            var descriptors = documentContext.TagHelpers;
-            if (descriptors == null || descriptors.Count == 0)
-            {
-                return null;
-            }
-
-            var prefix = documentContext.Prefix;
-            var tagHelperBinder = new TagHelperBinder(prefix, descriptors);
-            var binding = tagHelperBinder.GetBinding(tagName, attributes.ToList(), parentTag, parentIsTagHelper);
-
-            return binding;
-        }
-
-        public override IEnumerable<BoundAttributeDescriptor> GetBoundTagHelperAttributes(
-            TagHelperDocumentContext documentContext,
-            string attributeName,
-            TagHelperBinding binding)
-        {
-            if (documentContext == null)
-            {
-                throw new ArgumentNullException(nameof(documentContext));
-            }
-
-            if (attributeName == null)
-            {
-                throw new ArgumentNullException(nameof(attributeName));
-            }
-
-            if (binding == null)
-            {
-                throw new ArgumentNullException(nameof(binding));
-            }
-
-            var matchingBoundAttributes = new List<BoundAttributeDescriptor>();
-            foreach (var descriptor in binding.Descriptors)
-            {
-                foreach (var boundAttributeDescriptor in descriptor.BoundAttributes)
-                {
-                    if (TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, boundAttributeDescriptor))
-                    {
-                        matchingBoundAttributes.Add(boundAttributeDescriptor);
-
-                        // Only one bound attribute can match an attribute
-                        break;
-                    }
-                }
-            }
-
-            return matchingBoundAttributes;
-        }
-
-        public override IReadOnlyList<TagHelperDescriptor> GetTagHelpersGivenTag(
-            TagHelperDocumentContext documentContext,
-            string tagName,
-            string parentTag)
-        {
-            if (documentContext == null)
-            {
-                throw new ArgumentNullException(nameof(documentContext));
-            }
-
-            if (tagName == null)
-            {
-                throw new ArgumentNullException(nameof(tagName));
-            }
-
-            var matchingDescriptors = new List<TagHelperDescriptor>();
-            var descriptors = documentContext?.TagHelpers;
-            if (descriptors?.Count == 0)
-            {
-                return matchingDescriptors;
-            }
-
-            var prefix = documentContext.Prefix ?? string.Empty;
-            if (!tagName.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
-            {
-                // Can't possibly match TagHelpers, it doesn't start with the TagHelperPrefix.
-                return matchingDescriptors;
-            }
-
-            var tagNameWithoutPrefix = tagName.Substring(prefix.Length);
-            for (var i = 0; i < descriptors.Count; i++)
-            {
-                var descriptor = descriptors[i];
-                foreach (var rule in descriptor.TagMatchingRules)
-                {
-                    if (TagHelperMatchingConventions.SatisfiesTagName(tagNameWithoutPrefix, rule) &&
-                        TagHelperMatchingConventions.SatisfiesParentTag(parentTag, rule))
-                    {
-                        matchingDescriptors.Add(descriptor);
-                        break;
-                    }
-                }
-            }
-
-            return matchingDescriptors;
-        }
-
-        public override IReadOnlyList<TagHelperDescriptor> GetTagHelpersGivenParent(TagHelperDocumentContext documentContext, string parentTag)
-        {
-            if (documentContext == null)
-            {
-                throw new ArgumentNullException(nameof(documentContext));
-            }
-
-            var matchingDescriptors = new List<TagHelperDescriptor>();
-            var descriptors = documentContext?.TagHelpers;
-            if (descriptors?.Count == 0)
-            {
-                return matchingDescriptors;
-            }
-
-            for (var i = 0; i < descriptors.Count; i++)
-            {
-                var descriptor = descriptors[i];
-                foreach (var rule in descriptor.TagMatchingRules)
-                {
-                    if (TagHelperMatchingConventions.SatisfiesParentTag(parentTag, rule))
-                    {
-                        matchingDescriptors.Add(descriptor);
-                        break;
-                    }
-                }
-            }
-
-            return matchingDescriptors;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTagHelperResolver.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTagHelperResolver.cs
deleted file mode 100644
index 400a0ce2b8c3..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTagHelperResolver.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal class DefaultTagHelperResolver : TagHelperResolver
-    {
-        public override Task<TagHelperResolutionResult> GetTagHelpersAsync(ProjectSnapshot project, CancellationToken cancellationToken = default)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            if (project.Configuration == null || project.WorkspaceProject == null)
-            {
-                return Task.FromResult(TagHelperResolutionResult.Empty);
-            }
-            
-            return GetTagHelpersAsync(project, project.GetProjectEngine());
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTagHelperResolverFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTagHelperResolverFactory.cs
deleted file mode 100644
index 50e2e9617929..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTagHelperResolverFactory.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [Shared]
-    [ExportLanguageServiceFactory(typeof(TagHelperResolver), RazorLanguage.Name, ServiceLayer.Default)]
-    internal class DefaultTagHelperResolverFactory : ILanguageServiceFactory
-    {
-        public ILanguageService CreateLanguageService(HostLanguageServices languageServices)
-        {
-            return new DefaultTagHelperResolver();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTextBufferCodeDocumentProvider.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTextBufferCodeDocumentProvider.cs
deleted file mode 100644
index a9df7a9c45fe..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTextBufferCodeDocumentProvider.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.ComponentModel.Composition;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(TextBufferCodeDocumentProvider))]
-    internal class DefaultTextBufferCodeDocumentProvider : TextBufferCodeDocumentProvider
-    {
-        public override bool TryGetFromBuffer(ITextBuffer textBuffer, out RazorCodeDocument codeDocument)
-        {
-            if (textBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(textBuffer));
-            }
-
-            if (textBuffer.Properties.TryGetProperty(typeof(VisualStudioRazorParser), out VisualStudioRazorParser parser) && parser.CodeDocument != null)
-            {
-                codeDocument = parser.CodeDocument;
-                return true;
-            }
-
-            codeDocument = null;
-            return false;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTextBufferProvider.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTextBufferProvider.cs
deleted file mode 100644
index 22efa0ec08b5..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultTextBufferProvider.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.ComponentModel.Composition;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Projection;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(RazorTextBufferProvider))]
-    internal class DefaultTextBufferProvider : RazorTextBufferProvider
-    {
-        private readonly IBufferGraphFactoryService _bufferGraphService;
-
-        [ImportingConstructor]
-        public DefaultTextBufferProvider(IBufferGraphFactoryService bufferGraphService)
-        {
-            if (bufferGraphService == null)
-            {
-                throw new ArgumentNullException(nameof(bufferGraphService));
-            }
-
-            _bufferGraphService = bufferGraphService;
-        }
-
-        public override bool TryGetFromDocument(TextDocument document, out ITextBuffer textBuffer)
-        {
-            if (document == null)
-            {
-                throw new ArgumentNullException(nameof(document));
-            }
-
-            textBuffer = null;
-
-            if (!document.TryGetText(out var sourceText))
-            {
-                // Could not retrieve source text from the document. We have no way have locating an ITextBuffer.
-                return false;
-            }
-
-            var container = sourceText.Container;
-            ITextBuffer buffer;
-            try
-            {
-                buffer = container.GetTextBuffer();
-            }
-            catch (ArgumentException)
-            {
-                // The source text container was not built from an ITextBuffer.
-                return false;
-            }
-
-            var bufferGraph = _bufferGraphService.CreateBufferGraph(buffer);
-            var razorBuffer = bufferGraph.GetRazorBuffers().FirstOrDefault();
-
-            if (razorBuffer == null)
-            {
-                // Could not find a text buffer associated with the text document.
-                return false;
-            }
-
-            textBuffer = razorBuffer;
-            return true;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioDocumentTracker.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioDocumentTracker.cs
deleted file mode 100644
index 02311c217bee..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioDocumentTracker.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.Editor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal class DefaultVisualStudioDocumentTracker : VisualStudioDocumentTracker
-    {
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly string _filePath;
-        private readonly string _projectPath;
-        private readonly ProjectSnapshotManager _projectManager;
-        private readonly WorkspaceEditorSettings _workspaceEditorSettings;
-        private readonly ITextBuffer _textBuffer;
-        private readonly ImportDocumentManager _importDocumentManager;
-        private readonly List<ITextView> _textViews;
-        private readonly Workspace _workspace;
-        private bool _isSupportedProject;
-        private ProjectSnapshot _projectSnapshot;
-        private int _subscribeCount;
-
-        // Only allow a single tag helper computation task at a time.
-        private (ProjectSnapshot project, Task task) _computingTagHelpers;
-
-        // Stores the result from the last time we computed tag helpers.
-        private IReadOnlyList<TagHelperDescriptor> _tagHelpers;
-
-        public override event EventHandler<ContextChangeEventArgs> ContextChanged;
-
-        public DefaultVisualStudioDocumentTracker(
-            ForegroundDispatcher dispatcher,
-            string filePath,
-            string projectPath,
-            ProjectSnapshotManager projectManager,
-            WorkspaceEditorSettings workspaceEditorSettings,
-            Workspace workspace,
-            ITextBuffer textBuffer,
-            ImportDocumentManager importDocumentManager)
-        {
-            if (dispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(dispatcher));
-            }
-
-            if (string.IsNullOrEmpty(filePath))
-            {
-                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(filePath));
-            }
-
-            if (projectPath == null)
-            {
-                throw new ArgumentNullException(nameof(projectPath));
-            }
-
-            if (projectManager == null)
-            {
-                throw new ArgumentNullException(nameof(projectManager));
-            }
-
-            if (workspaceEditorSettings == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceEditorSettings));
-            }
-
-            if (workspace == null)
-            {
-                throw new ArgumentNullException(nameof(workspace));
-            }
-
-            if (textBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(textBuffer));
-            }
-
-            if (importDocumentManager == null)
-            {
-                throw new ArgumentNullException(nameof(importDocumentManager));
-            }
-
-            _foregroundDispatcher = dispatcher;
-            _filePath = filePath;
-            _projectPath = projectPath;
-            _projectManager = projectManager;
-            _workspaceEditorSettings = workspaceEditorSettings;
-            _textBuffer = textBuffer;
-            _importDocumentManager = importDocumentManager;
-            _workspace = workspace; // For now we assume that the workspace is the always default VS workspace.
-
-            _textViews = new List<ITextView>();
-            _tagHelpers = Array.Empty<TagHelperDescriptor>();
-        }
-
-        public override RazorConfiguration Configuration => _projectSnapshot?.Configuration;
-
-        public override EditorSettings EditorSettings => _workspaceEditorSettings.Current;
-
-        public override IReadOnlyList<TagHelperDescriptor> TagHelpers => _tagHelpers;
-
-        public override bool IsSupportedProject => _isSupportedProject;
-
-        public override Project Project =>
-            _projectSnapshot.WorkspaceProject == null ?
-            null :
-            _workspace.CurrentSolution.GetProject(_projectSnapshot.WorkspaceProject.Id);
-
-        internal override ProjectSnapshot ProjectSnapshot => _projectSnapshot;
-
-        public override ITextBuffer TextBuffer => _textBuffer;
-
-        public override IReadOnlyList<ITextView> TextViews => _textViews;
-
-        public override Workspace Workspace => _workspace;
-
-        public override string FilePath => _filePath;
-
-        public override string ProjectPath => _projectPath;
-
-        public Task PendingTagHelperTask => _computingTagHelpers.task ?? Task.CompletedTask;
-
-        internal void AddTextView(ITextView textView)
-        {
-            if (textView == null)
-            {
-                throw new ArgumentNullException(nameof(textView));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (!_textViews.Contains(textView))
-            {
-                _textViews.Add(textView);
-            }
-        }
-
-        internal void RemoveTextView(ITextView textView)
-        {
-            if (textView == null)
-            {
-                throw new ArgumentNullException(nameof(textView));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (_textViews.Contains(textView))
-            {
-                _textViews.Remove(textView);
-            }
-        }
-
-        public override ITextView GetFocusedTextView()
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            for (var i = 0; i < TextViews.Count; i++)
-            {
-                if (TextViews[i].HasAggregateFocus)
-                {
-                    return TextViews[i];
-                }
-            }
-
-            return null;
-        }
-
-        public void Subscribe()
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (_subscribeCount++ > 0)
-            {
-                return;
-            }
-
-            _projectSnapshot = _projectManager.GetOrCreateProject(_projectPath);
-            _isSupportedProject = true;
-
-            _projectManager.Changed += ProjectManager_Changed;
-            _workspaceEditorSettings.Changed += EditorSettingsManager_Changed;
-            _importDocumentManager.Changed += Import_Changed;
-
-            _importDocumentManager.OnSubscribed(this);
-
-            OnContextChanged(ContextChangeKind.ProjectChanged);
-        }
-
-        public void Unsubscribe()
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (_subscribeCount == 0 || _subscribeCount-- > 1)
-            {
-                return;
-            }
-
-            _importDocumentManager.OnUnsubscribed(this);
-
-            _projectManager.Changed -= ProjectManager_Changed;
-            _workspaceEditorSettings.Changed -= EditorSettingsManager_Changed;
-            _importDocumentManager.Changed -= Import_Changed;
-
-            // Detached from project.
-            _isSupportedProject = false;
-            _projectSnapshot = null;
-            OnContextChanged(kind: ContextChangeKind.ProjectChanged);
-        }
-
-        private void StartComputingTagHelpers()
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            Debug.Assert(_projectSnapshot != null);
-            Debug.Assert(_computingTagHelpers.project == null && _computingTagHelpers.task == null);
-
-            if (_projectSnapshot.TryGetTagHelpers(out var results))
-            {
-                _tagHelpers = results;
-                OnContextChanged(ContextChangeKind.TagHelpersChanged);
-                return;
-            }
-
-            // if we get here then we know the tag helpers aren't available, so force async for ease of testing
-            var task = _projectSnapshot
-                .GetTagHelpersAsync()
-                .ContinueWith(TagHelpersUpdated, CancellationToken.None, TaskContinuationOptions.RunContinuationsAsynchronously, _foregroundDispatcher.ForegroundScheduler);
-            _computingTagHelpers = (_projectSnapshot, task);
-        }
-
-        private void TagHelpersUpdated(Task<IReadOnlyList<TagHelperDescriptor>> task)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            Debug.Assert(_computingTagHelpers.project != null && _computingTagHelpers.task != null);
-
-            if (!_isSupportedProject)
-            {
-                return;
-            }
-
-            _tagHelpers = task.Exception == null ? task.Result : Array.Empty<TagHelperDescriptor>();
-            OnContextChanged(ContextChangeKind.TagHelpersChanged);
-
-            var projectHasChanges = _projectSnapshot != null && _projectSnapshot != _computingTagHelpers.project;
-            _computingTagHelpers = (null, null);
-
-            if (projectHasChanges)
-            {
-                // More changes, keep going.
-                StartComputingTagHelpers();
-            }
-        }
-
-        private void OnContextChanged(ContextChangeKind kind)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            var handler = ContextChanged;
-            if (handler != null)
-            {
-                handler(this, new ContextChangeEventArgs(kind));
-            }
-
-            if (kind == ContextChangeKind.ProjectChanged && 
-                _projectSnapshot != null &&
-                _computingTagHelpers.project == null)
-            {
-                StartComputingTagHelpers();
-            }
-        }
-
-        // Internal for testing
-        internal void ProjectManager_Changed(object sender, ProjectChangeEventArgs e)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (_projectPath != null &&
-                string.Equals(_projectPath, e.ProjectFilePath, StringComparison.OrdinalIgnoreCase))
-            {
-                // This will be the new snapshot unless the project was removed.
-                _projectSnapshot = _projectManager.GetLoadedProject(e.ProjectFilePath);
-
-                switch (e.Kind)
-                {
-                    case ProjectChangeKind.DocumentAdded:
-                    case ProjectChangeKind.DocumentRemoved:
-                    case ProjectChangeKind.DocumentChanged:
-
-                        // Nothing to do.
-                        break;
-
-                    case ProjectChangeKind.ProjectAdded:
-                    case ProjectChangeKind.ProjectChanged:
-
-                        // Just an update
-                        OnContextChanged(ContextChangeKind.ProjectChanged);
-                        break;
-
-                    case ProjectChangeKind.ProjectRemoved:
-
-                        // Fall back to ephemeral project
-                        _projectSnapshot = _projectManager.GetOrCreateProject(ProjectPath);
-                        OnContextChanged(ContextChangeKind.ProjectChanged);
-                        break;
-
-                    default:
-                        throw new InvalidOperationException($"Unknown ProjectChangeKind {e.Kind}");
-                }
-            }
-        }
-
-        // Internal for testing
-        internal void EditorSettingsManager_Changed(object sender, EditorSettingsChangedEventArgs args)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            OnContextChanged(ContextChangeKind.EditorSettingsChanged);
-        }
-
-        // Internal for testing
-        internal void Import_Changed(object sender, ImportChangedEventArgs args)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            foreach (var path in args.AssociatedDocuments)
-            {
-                if (string.Equals(_filePath, path, StringComparison.OrdinalIgnoreCase))
-                {
-                    OnContextChanged(ContextChangeKind.ImportsChanged);
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioDocumentTrackerFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioDocumentTrackerFactory.cs
deleted file mode 100644
index 5d04b9d479b9..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioDocumentTrackerFactory.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Diagnostics;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.Editor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal class DefaultVisualStudioDocumentTrackerFactory : VisualStudioDocumentTrackerFactory
-    {
-        private readonly ITextDocumentFactoryService _textDocumentFactory;
-        private readonly ProjectPathProvider _projectPathProvider;
-        private readonly Workspace _workspace;
-        private readonly ImportDocumentManager _importDocumentManager;
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly ProjectSnapshotManager _projectManager;
-        private readonly WorkspaceEditorSettings _workspaceEditorSettings;
-
-        public DefaultVisualStudioDocumentTrackerFactory(
-            ForegroundDispatcher foregroundDispatcher,
-            ProjectSnapshotManager projectManager,
-            WorkspaceEditorSettings workspaceEditorSettings,
-            ProjectPathProvider projectPathProvider,
-            ITextDocumentFactoryService textDocumentFactory,
-            ImportDocumentManager importDocumentManager,
-            Workspace workspace)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (projectManager == null)
-            {
-                throw new ArgumentNullException(nameof(projectManager));
-            }
-
-            if (workspaceEditorSettings == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceEditorSettings));
-            }
-
-            if (projectPathProvider == null)
-            {
-                throw new ArgumentNullException(nameof(projectPathProvider));
-            }
-
-            if (textDocumentFactory == null)
-            {
-                throw new ArgumentNullException(nameof(textDocumentFactory));
-            }
-
-            if (importDocumentManager == null)
-            {
-                throw new ArgumentNullException(nameof(importDocumentManager));
-            }
-
-            if (workspace == null)
-            {
-                throw new ArgumentNullException(nameof(workspace));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _projectManager = projectManager;
-            _workspaceEditorSettings = workspaceEditorSettings;
-            _projectPathProvider = projectPathProvider;
-            _textDocumentFactory = textDocumentFactory;
-            _importDocumentManager = importDocumentManager;
-            _workspace = workspace;
-        }
-
-        public override VisualStudioDocumentTracker Create(ITextBuffer textBuffer)
-        {
-            if (textBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(textBuffer));
-            }
-
-            if (!_textDocumentFactory.TryGetTextDocument(textBuffer, out var textDocument))
-            {
-                Debug.Fail("Text document should be available from the text buffer.");
-                return null;
-            }
-
-            if (!_projectPathProvider.TryGetProjectPath(textBuffer, out var projectPath))
-            {
-                return null;
-            }
-
-            var filePath = textDocument.FilePath;
-            var tracker = new DefaultVisualStudioDocumentTracker(_foregroundDispatcher, filePath, projectPath, _projectManager, _workspaceEditorSettings, _workspace, textBuffer, _importDocumentManager);
-
-            return tracker;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioDocumentTrackerFactoryFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioDocumentTrackerFactoryFactory.cs
deleted file mode 100644
index eed3ca436e28..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioDocumentTrackerFactoryFactory.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.Editor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [Shared]
-    [ExportLanguageServiceFactory(typeof(VisualStudioDocumentTrackerFactory), RazorLanguage.Name, ServiceLayer.Default)]
-    internal class DefaultVisualStudioDocumentTrackerFactoryFactory : ILanguageServiceFactory
-    {
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly ITextDocumentFactoryService _textDocumentFactory;
-
-        [ImportingConstructor]
-        public DefaultVisualStudioDocumentTrackerFactoryFactory(
-            ForegroundDispatcher foregroundDispatcher,
-            ITextDocumentFactoryService textDocumentFactory)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (textDocumentFactory == null)
-            {
-                throw new ArgumentNullException(nameof(textDocumentFactory));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _textDocumentFactory = textDocumentFactory;
-        }
-
-        public ILanguageService CreateLanguageService(HostLanguageServices languageServices)
-        {
-            if (languageServices == null)
-            {
-                throw new ArgumentNullException(nameof(languageServices));
-            }
-
-            var projectManager = languageServices.GetRequiredService<ProjectSnapshotManager>();
-            var workspaceEditorSettings = languageServices.GetRequiredService<WorkspaceEditorSettings>();
-            var importDocumentManager = languageServices.GetRequiredService<ImportDocumentManager>();
-
-            var projectPathProvider = languageServices.WorkspaceServices.GetRequiredService<ProjectPathProvider>();
-
-            return new DefaultVisualStudioDocumentTrackerFactory(
-                _foregroundDispatcher,
-                projectManager,
-                workspaceEditorSettings,
-                projectPathProvider,
-                _textDocumentFactory,
-                importDocumentManager,
-                languageServices.WorkspaceServices.Workspace);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioRazorParser.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioRazorParser.cs
deleted file mode 100644
index 25d446febff7..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioRazorParser.cs
+++ /dev/null
@@ -1,450 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.Editor;
-using Microsoft.Extensions.Internal;
-using Microsoft.VisualStudio.Text;
-using static Microsoft.VisualStudio.Editor.Razor.BackgroundParser;
-using ITextBuffer = Microsoft.VisualStudio.Text.ITextBuffer;
-using Timer = System.Threading.Timer;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal class DefaultVisualStudioRazorParser : VisualStudioRazorParser, IDisposable
-    {
-        public override event EventHandler<DocumentStructureChangedEventArgs> DocumentStructureChanged;
-
-        // Internal for testing.
-        internal TimeSpan IdleDelay = TimeSpan.FromSeconds(3);
-        internal Timer _idleTimer;
-        internal BackgroundParser _parser;
-        internal ChangeReference _latestChangeReference;
-        internal RazorSyntaxTreePartialParser _partialParser;
-
-        private readonly object IdleLock = new object();
-        private readonly VisualStudioCompletionBroker _completionBroker;
-        private readonly VisualStudioDocumentTracker _documentTracker;
-        private readonly ForegroundDispatcher _dispatcher;
-        private readonly ProjectSnapshotProjectEngineFactory _projectEngineFactory;
-        private readonly ErrorReporter _errorReporter;
-        private RazorProjectEngine _projectEngine;
-        private RazorCodeDocument _codeDocument;
-        private ITextSnapshot _snapshot;
-        private bool _disposed;
-
-        // For testing only
-        internal DefaultVisualStudioRazorParser(RazorCodeDocument codeDocument)
-        {
-            _codeDocument = codeDocument;
-        }
-
-        public DefaultVisualStudioRazorParser(
-            ForegroundDispatcher dispatcher,
-            VisualStudioDocumentTracker documentTracker,
-            ProjectSnapshotProjectEngineFactory projectEngineFactory,
-            ErrorReporter errorReporter,
-            VisualStudioCompletionBroker completionBroker)
-        {
-            if (dispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(dispatcher));
-            }
-
-            if (documentTracker == null)
-            {
-                throw new ArgumentNullException(nameof(documentTracker));
-            }
-
-            if (projectEngineFactory == null)
-            {
-                throw new ArgumentNullException(nameof(projectEngineFactory));
-            }
-
-            if (errorReporter == null)
-            {
-                throw new ArgumentNullException(nameof(errorReporter));
-            }
-
-            if (completionBroker == null)
-            {
-                throw new ArgumentNullException(nameof(completionBroker));
-            }
-
-            _dispatcher = dispatcher;
-            _projectEngineFactory = projectEngineFactory;
-            _errorReporter = errorReporter;
-            _completionBroker = completionBroker;
-            _documentTracker = documentTracker;
-
-            _documentTracker.ContextChanged += DocumentTracker_ContextChanged;
-        }
-
-        public override string FilePath => _documentTracker.FilePath;
-
-        public override RazorCodeDocument CodeDocument => _codeDocument;
-
-        public override ITextSnapshot Snapshot => _snapshot;
-
-        public override ITextBuffer TextBuffer => _documentTracker.TextBuffer;
-
-        public override bool HasPendingChanges => _latestChangeReference != null;
-
-        // Used in unit tests to ensure we can be notified when idle starts.
-        internal ManualResetEventSlim NotifyForegroundIdleStart { get; set; }
-
-        // Used in unit tests to ensure we can block background idle work.
-        internal ManualResetEventSlim BlockBackgroundIdleWork { get; set; }
-
-        public override void QueueReparse()
-        {
-            // Can be called from any thread
-
-            if (_dispatcher.IsForegroundThread)
-            {
-                ReparseOnForeground(null);
-            }
-            else
-            {
-                Task.Factory.StartNew(ReparseOnForeground, null, CancellationToken.None, TaskCreationOptions.None, _dispatcher.ForegroundScheduler);
-            }
-        }
-
-        public void Dispose()
-        {
-            _dispatcher.AssertForegroundThread();
-
-            StopParser();
-
-            _documentTracker.ContextChanged -= DocumentTracker_ContextChanged;
-
-            StopIdleTimer();
-
-            _disposed = true;
-        }
-
-        // Internal for testing
-        internal void DocumentTracker_ContextChanged(object sender, ContextChangeEventArgs args)
-        {
-            _dispatcher.AssertForegroundThread();
-
-            if (!TryReinitializeParser())
-            {
-                return;
-            }
-
-            // We have a new parser, force a reparse to generate new document information. Note that this
-            // only blocks until the reparse change has been queued.
-            QueueReparse();
-        }
-
-        // Internal for testing
-        internal bool TryReinitializeParser()
-        {
-            _dispatcher.AssertForegroundThread();
-
-            StopParser();
-
-            if (!_documentTracker.IsSupportedProject)
-            {
-                // Tracker is either starting up, tearing down or wrongfully instantiated.
-                // Either way, the tracker can't act on its associated project, neither can we.
-                return false;
-            }
-
-            StartParser();
-
-            return true;
-        }
-
-        // Internal for testing
-        internal void StartParser()
-        {
-            _dispatcher.AssertForegroundThread();
-
-            // Make sure any tests use the real thing or a good mock. These tests can cause failures
-            // that are hard to understand when this throws.
-            Debug.Assert(_documentTracker.IsSupportedProject);
-            Debug.Assert(_documentTracker.ProjectSnapshot != null);
-
-            _projectEngine = _projectEngineFactory.Create(_documentTracker.ProjectSnapshot, ConfigureProjectEngine);
-
-            Debug.Assert(_projectEngine != null); 
-            Debug.Assert(_projectEngine.Engine != null);
-            Debug.Assert(_projectEngine.FileSystem != null);
-
-            var projectDirectory = Path.GetDirectoryName(_documentTracker.ProjectPath);
-            _parser = new BackgroundParser(_projectEngine, FilePath, projectDirectory);
-            _parser.ResultsReady += OnResultsReady;
-            _parser.Start();
-
-            TextBuffer.Changed += TextBuffer_OnChanged;
-        }
-
-        // Internal for testing
-        internal void StopParser()
-        {
-            _dispatcher.AssertForegroundThread();
-
-            if (_parser != null)
-            {
-                // Detatch from the text buffer until we have a new parser to handle changes.
-                TextBuffer.Changed -= TextBuffer_OnChanged;
-
-                _parser.ResultsReady -= OnResultsReady;
-                _parser.Dispose();
-                _parser = null;
-            }
-        }
-
-        // Internal for testing
-        internal void StartIdleTimer()
-        {
-            _dispatcher.AssertForegroundThread();
-
-            lock (IdleLock)
-            {
-                if (_idleTimer == null)
-                {
-                    // Timer will fire after a fixed delay, but only once.
-                    _idleTimer = NonCapturingTimer.Create(state => ((DefaultVisualStudioRazorParser)state).Timer_Tick(), this, IdleDelay, Timeout.InfiniteTimeSpan);
-                }
-            }
-        }
-
-        // Internal for testing
-        internal void StopIdleTimer()
-        {
-            // Can be called from any thread.
-
-            lock (IdleLock)
-            {
-                if (_idleTimer != null)
-                {
-                    _idleTimer.Dispose();
-                    _idleTimer = null;
-                }
-            }
-        }
-
-        private void TextBuffer_OnChanged(object sender, TextContentChangedEventArgs args)
-        {
-            _dispatcher.AssertForegroundThread();
-
-            if (args.Changes.Count > 0)
-            {
-                // Idle timers are used to track provisional changes. Provisional changes only last for a single text change. After that normal
-                // partial parsing rules apply (stop the timer).
-                StopIdleTimer();
-            }
-
-            if (!args.TextChangeOccurred(out var changeInformation))
-            {
-                return;
-            }
-
-            var change = new SourceChange(changeInformation.firstChange.OldPosition, changeInformation.oldText.Length, changeInformation.newText);
-            var snapshot = args.After;
-            var result = PartialParseResultInternal.Rejected;
-
-            using (_parser.SynchronizeMainThreadState())
-            {
-                // Check if we can partial-parse
-                if (_partialParser != null && _parser.IsIdle)
-                {
-                    result = _partialParser.Parse(change);
-                }
-            }
-
-            // If partial parsing failed or there were outstanding parser tasks, start a full reparse
-            if ((result & PartialParseResultInternal.Rejected) == PartialParseResultInternal.Rejected)
-            {
-                QueueChange(change, snapshot);
-            }
-
-            if ((result & PartialParseResultInternal.Provisional) == PartialParseResultInternal.Provisional)
-            {
-                StartIdleTimer();
-            }
-        }
-
-        // Internal for testing
-        internal void OnIdle(object state)
-        {
-            _dispatcher.AssertForegroundThread();
-
-            if (_disposed)
-            {
-                return;
-            }
-
-            OnNotifyForegroundIdle();
-
-            foreach (var textView in _documentTracker.TextViews)
-            {
-                if (_completionBroker.IsCompletionActive(textView))
-                {
-                    // Completion list is still active, need to re-start timer.
-                    StartIdleTimer();
-                    return;
-                }
-            }
-
-            QueueReparse();
-        }
-
-        // Internal for testing
-        internal void ReparseOnForeground(object state)
-        {
-            _dispatcher.AssertForegroundThread();
-
-            if (_disposed)
-            {
-                return;
-            }
-
-            var snapshot = TextBuffer.CurrentSnapshot;
-            QueueChange(null, snapshot);
-        }
-
-        private void QueueChange(SourceChange change, ITextSnapshot snapshot)
-        {
-            _dispatcher.AssertForegroundThread();
-
-            _latestChangeReference = _parser.QueueChange(change, snapshot);
-        }
-
-        private void OnNotifyForegroundIdle()
-        {
-            if (NotifyForegroundIdleStart != null)
-            {
-                NotifyForegroundIdleStart.Set();
-            }
-        }
-
-        private void OnStartingBackgroundIdleWork()
-        {
-            if (BlockBackgroundIdleWork != null)
-            {
-                BlockBackgroundIdleWork.Wait();
-            }
-        }
-
-        private void Timer_Tick()
-        {
-            try
-            {
-                _dispatcher.AssertBackgroundThread();
-
-                OnStartingBackgroundIdleWork();
-
-                StopIdleTimer();
-
-                // We need to get back to the UI thread to properly check if a completion is active.
-                Task.Factory.StartNew(OnIdle, null, CancellationToken.None, TaskCreationOptions.None, _dispatcher.ForegroundScheduler);
-            }
-            catch (Exception ex)
-            {
-                // This is something totally unexpected, let's just send it over to the workspace.
-                Task.Factory.StartNew(() => _errorReporter.ReportError(ex), CancellationToken.None, TaskCreationOptions.None, _dispatcher.ForegroundScheduler);
-            }
-        }
-
-        private void OnResultsReady(object sender, BackgroundParserResultsReadyEventArgs args)
-        {
-            _dispatcher.AssertBackgroundThread();
-
-            // Jump back to UI thread to notify structure changes.
-            Task.Factory.StartNew(OnDocumentStructureChanged, args, CancellationToken.None, TaskCreationOptions.None, _dispatcher.ForegroundScheduler);
-        }
-
-        // Internal for testing
-        internal void OnDocumentStructureChanged(object state)
-        {
-            _dispatcher.AssertForegroundThread();
-
-            if (_disposed)
-            {
-                return;
-            }
-
-            var backgroundParserArgs = (BackgroundParserResultsReadyEventArgs)state;
-            if (_latestChangeReference == null || // extra hardening
-                _latestChangeReference != backgroundParserArgs.ChangeReference)
-            {
-                // In the middle of parsing a newer change or about to parse a newer change.
-                return;
-            }
-
-            if (backgroundParserArgs.ChangeReference.Snapshot != TextBuffer.CurrentSnapshot)
-            {
-                // Changes have impacted the snapshot after our we recorded our last change reference.
-                // This can happen for a multitude of reasons, usually because of a user auto-completing
-                // C# statements (causes multiple edits in quick succession). This ensures that our latest
-                // parse corresponds to the current snapshot.
-                QueueReparse();
-                return;
-            }
-
-            _latestChangeReference = null;
-            _codeDocument = backgroundParserArgs.CodeDocument;
-            _snapshot = backgroundParserArgs.ChangeReference.Snapshot;
-            _partialParser = new RazorSyntaxTreePartialParser(CodeDocument.GetSyntaxTree());
-
-            var documentStructureChangedArgs = new DocumentStructureChangedEventArgs(
-                backgroundParserArgs.ChangeReference.Change, 
-                backgroundParserArgs.ChangeReference.Snapshot, 
-                backgroundParserArgs.CodeDocument);
-            DocumentStructureChanged?.Invoke(this, documentStructureChangedArgs);
-        }
-
-        private void ConfigureProjectEngine(RazorProjectEngineBuilder builder)
-        {
-            builder.Features.Add(new VisualStudioParserOptionsFeature(_documentTracker.EditorSettings));
-            builder.Features.Add(new VisualStudioTagHelperFeature(_documentTracker.TagHelpers));
-        }
-
-        private class VisualStudioParserOptionsFeature : RazorEngineFeatureBase, IConfigureRazorCodeGenerationOptionsFeature
-        {
-            private readonly EditorSettings _settings;
-
-            public VisualStudioParserOptionsFeature(EditorSettings settings)
-            {
-                _settings = settings;
-            }
-
-            public int Order { get; set; }
-
-            public void Configure(RazorCodeGenerationOptionsBuilder options)
-            {
-                options.IndentSize = _settings.IndentSize;
-                options.IndentWithTabs = _settings.IndentWithTabs;
-            }
-        }
-
-        private class VisualStudioTagHelperFeature : ITagHelperFeature
-        {
-            private readonly IReadOnlyList<TagHelperDescriptor> _tagHelpers;
-
-            public VisualStudioTagHelperFeature(IReadOnlyList<TagHelperDescriptor> tagHelpers)
-            {
-                _tagHelpers = tagHelpers;
-            }
-
-            public RazorEngine Engine { get; set; }
-
-            public IReadOnlyList<TagHelperDescriptor> GetDescriptors()
-            {
-                return _tagHelpers;
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioRazorParserFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioRazorParserFactory.cs
deleted file mode 100644
index 8807802090b9..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioRazorParserFactory.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal class DefaultVisualStudioRazorParserFactory : VisualStudioRazorParserFactory
-    {
-        private readonly ForegroundDispatcher _dispatcher;
-        private readonly ProjectSnapshotProjectEngineFactory _projectEngineFactory;
-        private readonly VisualStudioCompletionBroker _completionBroker;
-        private readonly ErrorReporter _errorReporter;
-
-        public DefaultVisualStudioRazorParserFactory(
-            ForegroundDispatcher dispatcher,
-            ErrorReporter errorReporter,
-            VisualStudioCompletionBroker completionBroker,
-            ProjectSnapshotProjectEngineFactory projectEngineFactory)
-        {
-            if (dispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(dispatcher));
-            }
-
-            if (errorReporter == null)
-            {
-                throw new ArgumentNullException(nameof(errorReporter));
-            }
-
-            if (completionBroker == null)
-            {
-                throw new ArgumentNullException(nameof(completionBroker));
-            }
-
-            if (projectEngineFactory == null)
-            {
-                throw new ArgumentNullException(nameof(projectEngineFactory));
-            }
-
-            _dispatcher = dispatcher;
-            _errorReporter = errorReporter;
-            _completionBroker = completionBroker;
-            _projectEngineFactory = projectEngineFactory;
-        }
-
-        public override VisualStudioRazorParser Create(VisualStudioDocumentTracker documentTracker)
-        {
-            if (documentTracker == null)
-            {
-                throw new ArgumentNullException(nameof(documentTracker));
-            }
-
-            _dispatcher.AssertForegroundThread();
-
-            var parser = new DefaultVisualStudioRazorParser(
-                _dispatcher,
-                documentTracker,
-                _projectEngineFactory,
-                _errorReporter,
-                _completionBroker);
-            return parser;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioRazorParserFactoryFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioRazorParserFactoryFactory.cs
deleted file mode 100644
index 4e0ff7406e2e..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioRazorParserFactoryFactory.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [Shared]
-    [ExportLanguageServiceFactory(typeof(VisualStudioRazorParserFactory), RazorLanguage.Name, ServiceLayer.Default)]
-    internal class DefaultVisualStudioRazorParserFactoryFactory : ILanguageServiceFactory
-    {
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-
-        [ImportingConstructor]
-        public DefaultVisualStudioRazorParserFactoryFactory(ForegroundDispatcher foregroundDispatcher)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-        }
-        public ILanguageService CreateLanguageService(HostLanguageServices languageServices)
-        {
-            if (languageServices == null)
-            {
-                throw new ArgumentNullException(nameof(languageServices));
-            }
-
-            var workspaceServices = languageServices.WorkspaceServices;
-            var errorReporter = workspaceServices.GetRequiredService<ErrorReporter>();
-            var completionBroker = languageServices.GetRequiredService<VisualStudioCompletionBroker>();
-            var projectEngineFactory = workspaceServices.GetRequiredService<ProjectSnapshotProjectEngineFactory>();
-
-            return new DefaultVisualStudioRazorParserFactory(
-                _foregroundDispatcher,
-                errorReporter,
-                completionBroker,
-                projectEngineFactory);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultWorkspaceEditorSettings.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultWorkspaceEditorSettings.cs
deleted file mode 100644
index 0e49fbb8f4b1..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultWorkspaceEditorSettings.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Diagnostics;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.Editor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal class DefaultWorkspaceEditorSettings : WorkspaceEditorSettings
-    {
-        private readonly EditorSettingsManager _editorSettingsManager;
-        private readonly EventHandler<EditorSettingsChangedEventArgs> _onChanged;
-        private EventHandler<EditorSettingsChangedEventArgs> _changed;
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private int _listenerCount = 0;
-
-        public DefaultWorkspaceEditorSettings(ForegroundDispatcher foregroundDispatcher, EditorSettingsManager editorSettingsManager)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (editorSettingsManager == null)
-            {
-                throw new ArgumentNullException(nameof(editorSettingsManager));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _editorSettingsManager = editorSettingsManager;
-            _onChanged = OnChanged;
-        }
-
-        public override event EventHandler<EditorSettingsChangedEventArgs> Changed
-        {
-            add
-            {
-                _foregroundDispatcher.AssertForegroundThread();
-
-                _listenerCount++;
-                _changed += value;
-
-                if (_listenerCount == 1)
-                {
-                    // We bind to the editor settings manager only when we have listeners to avoid leaking memory.
-                    // Basically we're relying on anyone listening to us to have an understanding of when they're going
-                    // to be torn down. In Razor's case this will just be the document tracker factory (which does know).
-                    AttachToEditorSettingsManager();
-                }
-            }
-            remove
-            {
-                _foregroundDispatcher.AssertForegroundThread();
-
-                _listenerCount--;
-                _changed -= value;
-
-                if (_listenerCount == 0)
-                {
-                    // We detatch from the editor settings manager when no one is listening to allow us to be garbage
-                    // collected in the case that the workspace is tearing down.
-                    DetachFromEditorSettingsManager();
-                }
-            }
-        }
-
-        // Internal for testing
-        internal virtual void AttachToEditorSettingsManager()
-        {
-            _editorSettingsManager.Changed += _onChanged;
-        }
-
-        // Internal for testing
-        internal virtual void DetachFromEditorSettingsManager()
-        {
-            _editorSettingsManager.Changed -= _onChanged;
-        }
-
-        public override EditorSettings Current => _editorSettingsManager.Current;
-
-        // Internal for testing
-        internal void OnChanged(object sender, EditorSettingsChangedEventArgs e)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            Debug.Assert(_changed != null, nameof(OnChanged) + " should not be invoked when there are no listeners.");
-
-            var args = new EditorSettingsChangedEventArgs(Current);
-            _changed?.Invoke(this, args);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultWorkspaceEditorSettingsFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultWorkspaceEditorSettingsFactory.cs
deleted file mode 100644
index 6bc448b43fb6..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultWorkspaceEditorSettingsFactory.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.Editor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [Shared]
-    [ExportLanguageServiceFactory(typeof(WorkspaceEditorSettings), RazorLanguage.Name)]
-    internal class DefaultWorkspaceEditorSettingsFactory : ILanguageServiceFactory
-    {
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly EditorSettingsManager _editorSettingsManager;
-
-        [ImportingConstructor]
-        public DefaultWorkspaceEditorSettingsFactory(ForegroundDispatcher foregroundDispatcher, EditorSettingsManager editorSettingsManager)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (editorSettingsManager == null)
-            {
-                throw new ArgumentNullException(nameof(editorSettingsManager));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _editorSettingsManager = editorSettingsManager;
-        }
-
-        public ILanguageService CreateLanguageService(HostLanguageServices languageServices)
-        {
-            if (languageServices == null)
-            {
-                throw new ArgumentNullException(nameof(languageServices));
-            }
-
-            return new DefaultWorkspaceEditorSettings(_foregroundDispatcher, _editorSettingsManager);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DocumentStructureChangedEventArgs.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DocumentStructureChangedEventArgs.cs
deleted file mode 100644
index 4cd5e5c7dc84..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DocumentStructureChangedEventArgs.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public sealed class DocumentStructureChangedEventArgs : EventArgs
-    {
-        public DocumentStructureChangedEventArgs(
-            SourceChange change,
-            ITextSnapshot snapshot,
-            RazorCodeDocument codeDocument)
-        {
-            SourceChange = change;
-            Snapshot = snapshot;
-            CodeDocument = codeDocument;
-        }
-
-        /// <summary>
-        /// The <see cref="AspNetCore.Razor.Language.SourceChange"/> which triggered the re-parse.
-        /// </summary>
-        public SourceChange SourceChange { get; }
-
-        /// <summary>
-        /// The text snapshot used in the re-parse.
-        /// </summary>
-        public ITextSnapshot Snapshot { get; }
-
-        /// <summary>
-        /// The result of the parsing and code generation.
-        /// </summary>
-        public RazorCodeDocument CodeDocument { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/DefaultFileChangeTracker.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/DefaultFileChangeTracker.cs
deleted file mode 100644
index 95cfcfa5ebac..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/DefaultFileChangeTracker.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    // A noop implementation for non-ide cases
-    internal class DefaultFileChangeTracker : FileChangeTracker
-    {
-        public override event EventHandler<FileChangeEventArgs> Changed;
-
-        public DefaultFileChangeTracker(string filePath)
-        {
-            if (filePath == null)
-            {
-                throw new ArgumentNullException(nameof(filePath));
-            }
-
-            FilePath = filePath;
-
-            GC.KeepAlive(Changed);
-        }
-
-        public override string FilePath { get; }
-
-        public override void StartListening()
-        {
-            // Do nothing
-        }
-
-        public override void StopListening()
-        {
-            // Do nothing
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/DefaultFileChangeTrackerFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/DefaultFileChangeTrackerFactory.cs
deleted file mode 100644
index 6a982d119d80..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/DefaultFileChangeTrackerFactory.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Host.Mef;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    [ExportWorkspaceService(typeof(FileChangeTrackerFactory), layer: ServiceLayer.Editor)]
-    internal class DefaultFileChangeTrackerFactory : FileChangeTrackerFactory
-    {
-        public override FileChangeTracker Create(string filePath)
-        {
-            if (filePath == null)
-            {
-                throw new ArgumentNullException(nameof(filePath));
-            }
-
-            return new DefaultFileChangeTracker(filePath);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/EditorDocument.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/EditorDocument.cs
deleted file mode 100644
index d31e8d008518..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/EditorDocument.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    // Tracks the mutable state associated with a document - in contrast to DocumentSnapshot
-    // which tracks the state at a point in time.
-    internal sealed class EditorDocument : IDisposable
-    {
-        private readonly EditorDocumentManager _documentManager;
-        private readonly FileChangeTracker _fileTracker;
-        private readonly SnapshotChangeTracker _snapshotTracker;
-        private readonly EventHandler _changedOnDisk;
-        private readonly EventHandler _changedInEditor;
-        private readonly EventHandler _opened;
-        private readonly EventHandler _closed;
-
-        private bool _disposed;
-
-        public EditorDocument(
-            EditorDocumentManager documentManager,
-            string projectFilePath,
-            string documentFilePath,
-            TextLoader textLoader,
-            FileChangeTracker fileTracker,
-            ITextBuffer textBuffer,
-            EventHandler changedOnDisk,
-            EventHandler changedInEditor,
-            EventHandler opened,
-            EventHandler closed)
-        {
-            if (documentManager == null)
-            {
-                throw new ArgumentNullException(nameof(documentManager));
-            }
-
-            if (projectFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(projectFilePath));
-            }
-
-            if (documentFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(documentFilePath));
-            }
-
-            if (textLoader == null)
-            {
-                throw new ArgumentNullException(nameof(textLoader));
-            }
-
-            if (fileTracker == null)
-            {
-                throw new ArgumentNullException(nameof(fileTracker));
-            }
-
-            _documentManager = documentManager;
-            ProjectFilePath = projectFilePath;
-            DocumentFilePath = documentFilePath;
-            TextLoader = textLoader;
-            _fileTracker = fileTracker;
-            _changedOnDisk = changedOnDisk;
-            _changedInEditor = changedInEditor;
-            _opened = opened;
-            _closed = closed;
-
-            _snapshotTracker = new SnapshotChangeTracker();
-            _fileTracker.Changed += ChangeTracker_Changed;
-
-            // Only one of these should be active at a time.
-            if (textBuffer == null)
-            {
-                _fileTracker.StartListening();
-            }
-            else
-            {
-                _snapshotTracker.StartTracking(textBuffer);
-
-                EditorTextBuffer = textBuffer;
-                EditorTextContainer = textBuffer.AsTextContainer();
-                EditorTextContainer.TextChanged += TextContainer_Changed;
-            }
-        }
-
-        public string ProjectFilePath { get; }
-
-        public string DocumentFilePath { get; }
-
-        public bool IsOpenInEditor => EditorTextBuffer != null;
-
-        public SourceTextContainer EditorTextContainer { get; private set; }
-
-        public ITextBuffer EditorTextBuffer { get; private set; }
-
-        public TextLoader TextLoader { get; }
-
-        public void ProcessOpen(ITextBuffer textBuffer)
-        {
-            if (textBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(textBuffer));
-            }
-
-            _fileTracker.StopListening();
-
-            _snapshotTracker.StartTracking(textBuffer);
-            EditorTextBuffer = textBuffer;
-            EditorTextContainer = textBuffer.AsTextContainer();
-            EditorTextContainer.TextChanged += TextContainer_Changed;
-
-            _opened?.Invoke(this, EventArgs.Empty);
-        }
-
-        public void ProcessClose()
-        {
-            _closed?.Invoke(this, EventArgs.Empty);
-
-            _snapshotTracker.StopTracking(EditorTextBuffer);
-
-            EditorTextContainer.TextChanged -= TextContainer_Changed;
-            EditorTextContainer = null;
-            EditorTextBuffer = null;
-            
-            _fileTracker.StartListening();
-        }
-
-        private void ChangeTracker_Changed(object sender, FileChangeEventArgs e)
-        {
-            if (e.Kind == FileChangeKind.Changed)
-            {
-                _changedOnDisk?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
-        private void TextContainer_Changed(object sender, TextChangeEventArgs e)
-        {
-            _changedInEditor?.Invoke(this, EventArgs.Empty);
-        }
-
-        public void Dispose()
-        {
-            if (!_disposed)
-            {
-                _fileTracker.Changed -= ChangeTracker_Changed;
-                _fileTracker.StopListening();
-
-                if (EditorTextBuffer != null)
-                {
-                    _snapshotTracker.StopTracking(EditorTextBuffer);
-                    EditorTextBuffer = null;
-                }
-
-                if (EditorTextContainer != null)
-                {
-                    EditorTextContainer.TextChanged -= TextContainer_Changed;
-                    EditorTextContainer = null;
-                }
-
-                _documentManager.RemoveDocument(this);
-
-                _disposed = true;
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/EditorDocumentManager.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/EditorDocumentManager.cs
deleted file mode 100644
index 89f8745e6ca3..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/EditorDocumentManager.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    internal abstract class EditorDocumentManager : IWorkspaceService
-    {
-        public abstract EditorDocument GetOrCreateDocument(
-            DocumentKey key,
-            EventHandler changedOnDisk,
-            EventHandler changedInEditor,
-            EventHandler opened,
-            EventHandler closed);
-
-        public abstract bool TryGetDocument(DocumentKey key, out EditorDocument document);
-
-        public abstract bool TryGetMatchingDocuments(string filePath, out EditorDocument[] documents);
-
-        public abstract void RemoveDocument(EditorDocument document);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/EditorDocumentManagerBase.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/EditorDocumentManagerBase.cs
deleted file mode 100644
index 34abfe79d2ca..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/EditorDocumentManagerBase.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    // Similar to the DocumentProvider in dotnet/Roslyn - but simplified quite a bit to remove
-    // concepts that we don't need. Responsible for providing data about text changes for documents
-    // and editor open/closed state.
-    internal abstract class EditorDocumentManagerBase : EditorDocumentManager
-    {
-        private readonly FileChangeTrackerFactory _fileChangeTrackerFactory;
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-
-        private readonly Dictionary<DocumentKey, EditorDocument> _documents;
-        private readonly Dictionary<string, List<DocumentKey>> _documentsByFilePath;
-        protected readonly object _lock;
-
-        public EditorDocumentManagerBase(
-            ForegroundDispatcher foregroundDispatcher,
-            FileChangeTrackerFactory fileChangeTrackerFactory)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (fileChangeTrackerFactory == null)
-            {
-                throw new ArgumentNullException(nameof(fileChangeTrackerFactory));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _fileChangeTrackerFactory = fileChangeTrackerFactory;
-
-            _documents = new Dictionary<DocumentKey, EditorDocument>();
-            _documentsByFilePath = new Dictionary<string, List<DocumentKey>>(FilePathComparer.Instance);
-            _lock = new object();
-        }
-
-        protected ForegroundDispatcher ForegroundDispatcher => _foregroundDispatcher;
-
-        protected abstract ITextBuffer GetTextBufferForOpenDocument(string filePath);
-
-        protected abstract void OnDocumentOpened(EditorDocument document);
-
-        protected abstract void OnDocumentClosed(EditorDocument document);
-
-        public sealed override bool TryGetDocument(DocumentKey key, out EditorDocument document)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            lock (_lock)
-            {
-                return _documents.TryGetValue(key, out document);
-            }
-        }
-
-        public sealed override bool TryGetMatchingDocuments(string filePath, out EditorDocument[] documents)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            lock (_lock)
-            {
-                if (!_documentsByFilePath.TryGetValue(filePath, out var keys))
-                {
-                    documents = null;
-                    return false;
-                }
-
-                documents = new EditorDocument[keys.Count];
-                for (var i = 0; i < keys.Count; i++)
-                {
-                    documents[i] = _documents[keys[i]];
-                }
-
-                return true;
-            }
-        }
-
-        public sealed override EditorDocument GetOrCreateDocument(
-            DocumentKey key,
-            EventHandler changedOnDisk,
-            EventHandler changedInEditor,
-            EventHandler opened,
-            EventHandler closed)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            EditorDocument document;
-
-            lock (_lock)
-            {
-                if (TryGetDocument(key, out document))
-                {
-                    return document;
-                }
-
-                // Check if the document is already open and initialized, and associate a buffer if possible.
-                var textBuffer = GetTextBufferForOpenDocument(key.DocumentFilePath);
-                document = new EditorDocument(
-                    this,
-                    key.ProjectFilePath,
-                    key.DocumentFilePath,
-                    new FileTextLoader(key.DocumentFilePath, defaultEncoding: null),
-                    _fileChangeTrackerFactory.Create(key.DocumentFilePath),
-                    textBuffer,
-                    changedOnDisk,
-                    changedInEditor,
-                    opened,
-                    closed);
-
-                _documents.Add(key, document);
-
-                if (!_documentsByFilePath.TryGetValue(key.DocumentFilePath, out var documents))
-                {
-                    documents = new List<DocumentKey>();
-                    _documentsByFilePath.Add(key.DocumentFilePath, documents);
-                }
-
-                if (!documents.Contains(key))
-                {
-                    documents.Add(key);
-                }
-
-                if (document.IsOpenInEditor)
-                {
-                    OnDocumentOpened(document);
-                }
-
-                return document;
-            }
-        }
-
-        protected void DocumentOpened(string filePath, ITextBuffer textBuffer)
-        {
-            if (filePath == null)
-            {
-                throw new ArgumentNullException(nameof(filePath));
-            }
-
-            if (textBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(textBuffer));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            lock (_lock)
-            {
-                if (TryGetMatchingDocuments(filePath, out var documents))
-                {
-                    for (var i = 0; i < documents.Length; i++)
-                    {
-                        var document = documents[i];
-
-                        document.ProcessOpen(textBuffer);
-                        OnDocumentOpened(document);
-                    }
-                }
-            }
-        }
-
-        protected void DocumentClosed(string filePath)
-        {
-            if (filePath == null)
-            {
-                throw new ArgumentNullException(nameof(filePath));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            lock (_lock)
-            {
-                if (TryGetMatchingDocuments(filePath, out var documents))
-                {
-                    for (var i = 0; i < documents.Length; i++)
-                    {
-                        var document = documents[i];
-
-                        document.ProcessClose();
-                        OnDocumentClosed(document);
-                    }
-                }
-            }
-        }
-
-        public sealed override void RemoveDocument(EditorDocument document)
-        {
-            if (document == null)
-            {
-                throw new ArgumentNullException(nameof(document));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            var key = new DocumentKey(document.ProjectFilePath, document.DocumentFilePath);
-            if (_documentsByFilePath.TryGetValue(document.DocumentFilePath, out var documents))
-            {
-                documents.Remove(key);
-
-                if (documents.Count == 0)
-                {
-                    _documentsByFilePath.Remove(document.DocumentFilePath);
-                }
-            }
-
-            _documents.Remove(key);
-
-            if (document.IsOpenInEditor)
-            {
-                OnDocumentClosed(document);
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/EditorDocumentManagerListener.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/EditorDocumentManagerListener.cs
deleted file mode 100644
index 284df8859053..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/EditorDocumentManagerListener.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    // Hooks up the document manager to project snapshot events. The project snapshot manager
-    // tracks the existance of projects/files and the the document manager watches for changes.
-    //
-    // This class forwards notifications in both directions.
-    [Export(typeof(ProjectSnapshotChangeTrigger))]
-    internal class EditorDocumentManagerListener : ProjectSnapshotChangeTrigger
-    {
-        private readonly EventHandler _onChangedOnDisk;
-        private readonly EventHandler _onChangedInEditor;
-        private readonly EventHandler _onOpened;
-        private readonly EventHandler _onClosed;
-        
-        private EditorDocumentManager _documentManager;
-        private ProjectSnapshotManagerBase _projectManager;
-
-        [ImportingConstructor]
-        public EditorDocumentManagerListener()
-        {
-            _onChangedOnDisk = Document_ChangedOnDisk;
-            _onChangedInEditor = Document_ChangedInEditor;
-            _onOpened = Document_Opened;
-            _onClosed = Document_Closed;
-        }
-
-        // For testing purposes only.
-        internal EditorDocumentManagerListener(EditorDocumentManager documentManager, EventHandler onChangedOnDisk, EventHandler onChangedInEditor, EventHandler onOpened, EventHandler onClosed)
-        {
-            _documentManager = documentManager;
-            _onChangedOnDisk = onChangedOnDisk;
-            _onChangedInEditor = onChangedInEditor;
-            _onOpened = onOpened;
-            _onClosed = onClosed;
-        }
-
-        public override void Initialize(ProjectSnapshotManagerBase projectManager)
-        {
-            if (projectManager == null)
-            {
-                throw new ArgumentNullException(nameof(projectManager));
-            }
-
-            _projectManager = projectManager;
-            _documentManager = projectManager.Workspace.Services.GetRequiredService<EditorDocumentManager>();
-
-            _projectManager.Changed += ProjectManager_Changed;
-        }
-
-        // Internal for testing.
-        internal void ProjectManager_Changed(object sender, ProjectChangeEventArgs e)
-        {
-            switch (e.Kind)
-            {
-                case ProjectChangeKind.DocumentAdded:
-                    {
-                        var key = new DocumentKey(e.ProjectFilePath, e.DocumentFilePath);
-                        var document = _documentManager.GetOrCreateDocument(key, _onChangedOnDisk, _onChangedInEditor, _onOpened, _onClosed);
-                        if (document.IsOpenInEditor)
-                        {
-                            _onOpened(document, EventArgs.Empty);
-                        }
-
-                        break;
-                    }
-
-                case ProjectChangeKind.DocumentRemoved:
-                    {
-                        // This class 'owns' the document entry so it's safe for us to dispose it.
-                        if (_documentManager.TryGetDocument(new DocumentKey(e.ProjectFilePath, e.DocumentFilePath), out var document))
-                        {
-                            document.Dispose();
-                        }
-                        break;
-                    }
-            }
-        }
-
-        private void Document_ChangedOnDisk(object sender, EventArgs e)
-        {
-            var document = (EditorDocument)sender;
-            _projectManager.DocumentChanged(document.ProjectFilePath, document.DocumentFilePath, document.TextLoader);
-        }
-
-        private void Document_ChangedInEditor(object sender, EventArgs e)
-        {
-            var document = (EditorDocument)sender;
-            _projectManager.DocumentChanged(document.ProjectFilePath, document.DocumentFilePath, document.EditorTextContainer.CurrentText);
-        }
-
-        private void Document_Opened(object sender, EventArgs e)
-        {
-            var document = (EditorDocument)sender;
-            _projectManager.DocumentOpened(document.ProjectFilePath, document.DocumentFilePath, document.EditorTextContainer.CurrentText);
-        }
-
-        private void Document_Closed(object sender, EventArgs e)
-        {
-            var document = (EditorDocument)sender;
-            _projectManager.DocumentClosed(document.ProjectFilePath, document.DocumentFilePath, document.TextLoader);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/FileChangeEventArgs.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/FileChangeEventArgs.cs
deleted file mode 100644
index b7541308d495..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/FileChangeEventArgs.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    internal sealed class FileChangeEventArgs : EventArgs
-    {
-        public FileChangeEventArgs(string filePath, FileChangeKind kind)
-        {
-            FilePath = filePath;
-            Kind = kind;
-        }
-
-        public string FilePath { get; }
-
-        public FileChangeKind Kind { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/FileChangeKind.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/FileChangeKind.cs
deleted file mode 100644
index 7c3fff9d8f65..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/FileChangeKind.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    internal enum FileChangeKind
-    {
-        Added,
-        Removed,
-        Changed,
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/FileChangeTracker.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/FileChangeTracker.cs
deleted file mode 100644
index d34c42572aff..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/FileChangeTracker.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    internal abstract class FileChangeTracker
-    {
-        public abstract event EventHandler<FileChangeEventArgs> Changed;
-
-        public abstract string FilePath { get; }
-
-        public abstract void StartListening();
-
-        public abstract void StopListening();
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/FileChangeTrackerFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/FileChangeTrackerFactory.cs
deleted file mode 100644
index febad8989011..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/FileChangeTrackerFactory.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis.Host;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    internal abstract class FileChangeTrackerFactory : IWorkspaceService
-    {
-        public abstract FileChangeTracker Create(string filePath);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/SnapshotChangeTracker.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/SnapshotChangeTracker.cs
deleted file mode 100644
index 13a75d5ea7d3..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Documents/SnapshotChangeTracker.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    // See ReiteratedVersionSnapshotTracker in dotnet/Roslyn -- this is primarily here for the
-    // side-effect of making sure the last 'reiterated' snapshot is retained in memory.
-    //
-    // Since we're interacting with the workspace in the same way, we're doing the same thing.
-    internal class SnapshotChangeTracker
-    {
-        private ITextBuffer _textBuffer;
-        private ITextSnapshot _snapshot;
-
-        public void StartTracking(ITextBuffer buffer)
-        {
-            // buffer has changed. stop tracking old buffer
-            if (_textBuffer != null && buffer != _textBuffer)
-            {
-                _textBuffer.ChangedHighPriority -= OnTextBufferChanged;
-
-                _textBuffer = null;
-                _snapshot = null;
-            }
-
-            // start tracking new buffer
-            if (buffer != null && _snapshot == null)
-            {
-                _snapshot = buffer.CurrentSnapshot;
-                _textBuffer = buffer;
-
-                buffer.ChangedHighPriority += OnTextBufferChanged;
-            }
-        }
-
-        public void StopTracking(ITextBuffer buffer)
-        {
-            if (_textBuffer == buffer && buffer != null && _snapshot != null)
-            {
-                buffer.ChangedHighPriority -= OnTextBufferChanged;
-
-                _textBuffer = null;
-                _snapshot = null;
-            }
-        }
-
-        private void OnTextBufferChanged(object sender, TextContentChangedEventArgs e)
-        {
-            if (sender is ITextBuffer buffer)
-            {
-                var snapshot = _snapshot;
-                if (snapshot != null && snapshot.Version != null && e.AfterVersion != null &&
-                    snapshot.Version.ReiteratedVersionNumber < e.AfterVersion.ReiteratedVersionNumber)
-                {
-                    _snapshot = e.After;
-                }
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/EditorSettingsManager.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/EditorSettingsManager.cs
deleted file mode 100644
index c3e0399bde25..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/EditorSettingsManager.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Razor.Editor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public abstract class EditorSettingsManager
-    {
-        public abstract event EventHandler<EditorSettingsChangedEventArgs> Changed;
-
-        public abstract EditorSettings Current { get; }
-
-        public abstract void Update(EditorSettings updateSettings);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ElementCompletionContext.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ElementCompletionContext.cs
deleted file mode 100644
index 6d2c3965f590..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ElementCompletionContext.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public sealed class ElementCompletionContext
-    {
-        public ElementCompletionContext(
-            TagHelperDocumentContext documentContext,
-            IEnumerable<string> existingCompletions,
-            string containingTagName,
-            IEnumerable<KeyValuePair<string, string>> attributes,
-            string containingParentTagName,
-            bool containingParentIsTagHelper,
-            Func<string, bool> inHTMLSchema)
-        {
-            if (documentContext == null)
-            {
-                throw new ArgumentNullException(nameof(documentContext));
-            }
-
-            if (existingCompletions == null)
-            {
-                throw new ArgumentNullException(nameof(existingCompletions));
-            }
-
-            if (inHTMLSchema == null)
-            {
-                throw new ArgumentNullException(nameof(inHTMLSchema));
-            }
-
-            DocumentContext = documentContext;
-            ExistingCompletions = existingCompletions;
-            ContainingTagName = containingTagName;
-            Attributes = attributes;
-            ContainingParentTagName = containingParentTagName;
-            ContainingParentIsTagHelper = containingParentIsTagHelper;
-            InHTMLSchema = inHTMLSchema;
-        }
-
-        public TagHelperDocumentContext DocumentContext { get; }
-
-        public IEnumerable<string> ExistingCompletions { get; }
-
-        public string ContainingTagName { get; }
-
-        public IEnumerable<KeyValuePair<string, string>> Attributes { get; }
-
-        public string ContainingParentTagName { get; }
-
-        public bool ContainingParentIsTagHelper { get; }
-
-        public Func<string, bool> InHTMLSchema { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ElementCompletionResult.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ElementCompletionResult.cs
deleted file mode 100644
index 3f5a9ad2d799..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ElementCompletionResult.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public abstract class ElementCompletionResult
-    {
-        private ElementCompletionResult()
-        {
-        }
-
-        public abstract IReadOnlyDictionary<string, IEnumerable<TagHelperDescriptor>> Completions { get; }
-
-        internal static ElementCompletionResult Create(Dictionary<string, HashSet<TagHelperDescriptor>> completions)
-        {
-            var readonlyCompletions = completions.ToDictionary(
-                key => key.Key,
-                value => (IEnumerable<TagHelperDescriptor>)value.Value,
-                completions.Comparer);
-            var result = new DefaultElementCompletionResult(readonlyCompletions);
-
-            return result;
-        }
-
-        private class DefaultElementCompletionResult : ElementCompletionResult
-        {
-            private readonly IReadOnlyDictionary<string, IEnumerable<TagHelperDescriptor>> _completions;
-
-            public DefaultElementCompletionResult(IReadOnlyDictionary<string, IEnumerable<TagHelperDescriptor>> completions)
-            {
-                _completions = completions;
-            }
-
-            public override IReadOnlyDictionary<string, IEnumerable<TagHelperDescriptor>> Completions => _completions;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ImportChangedEventArgs.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ImportChangedEventArgs.cs
deleted file mode 100644
index ffe70a47886e..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ImportChangedEventArgs.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.Editor.Razor.Documents;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal class ImportChangedEventArgs : EventArgs
-    {
-        public ImportChangedEventArgs(string filePath, FileChangeKind kind, IEnumerable<string> associatedDocuments)
-        {
-            FilePath = filePath;
-            Kind = kind;
-            AssociatedDocuments = associatedDocuments;
-        }
-
-        public string FilePath { get; }
-
-        public FileChangeKind Kind { get; }
-
-        public IEnumerable<string> AssociatedDocuments { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ImportDocumentManager.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ImportDocumentManager.cs
deleted file mode 100644
index 0dbc93a21b95..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ImportDocumentManager.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Host;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal abstract class ImportDocumentManager : ILanguageService
-    {
-        public abstract event EventHandler<ImportChangedEventArgs> Changed;
-
-        public abstract void OnSubscribed(VisualStudioDocumentTracker tracker);
-
-        public abstract void OnUnsubscribed(VisualStudioDocumentTracker tracker);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_1_0.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_1_0.cs
deleted file mode 100644
index 9b3b92eb898e..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_1_0.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Reflection;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [ExportCustomProjectEngineFactory("MVC-1.0", SupportsSerialization = true)]
-    internal class LegacyProjectEngineFactory_1_0 : IProjectEngineFactory
-    {
-        private const string AssemblyName = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X";
-
-        public RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
-        {
-            // Rewrite the assembly name into a full name just like this one, but with the name of the MVC design time assembly.
-            var assemblyName = new AssemblyName(typeof(LegacyProjectEngineFactory_1_0).Assembly.FullName);
-            assemblyName.Name = AssemblyName;
-
-            var extension = new AssemblyExtension(configuration.ConfigurationName, Assembly.Load(assemblyName));
-            var initializer = extension.CreateInitializer();
-
-            return RazorProjectEngine.Create(configuration, fileSystem, b =>
-            {
-                initializer.Initialize(b);
-                configure?.Invoke(b);
-            });
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_1_1.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_1_1.cs
deleted file mode 100644
index d01e6999a82c..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_1_1.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Reflection;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [ExportCustomProjectEngineFactory("MVC-1.1", SupportsSerialization = true)]
-    internal class LegacyProjectEngineFactory_1_1 : IProjectEngineFactory
-    {
-        private const string AssemblyName = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X";
-
-        public RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
-        {
-            // Rewrite the assembly name into a full name just like this one, but with the name of the MVC design time assembly.
-            var assemblyName = new AssemblyName(typeof(LegacyProjectEngineFactory_1_1).Assembly.FullName);
-            assemblyName.Name = AssemblyName;
-
-            var extension = new AssemblyExtension(configuration.ConfigurationName, Assembly.Load(assemblyName));
-            var initializer = extension.CreateInitializer();
-
-            return RazorProjectEngine.Create(configuration, fileSystem, b =>
-            {
-                initializer.Initialize(b);
-                configure?.Invoke(b);
-            });
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_2_0.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_2_0.cs
deleted file mode 100644
index ebf9e144f5cb..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_2_0.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Reflection;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [ExportCustomProjectEngineFactory("MVC-2.0", SupportsSerialization = true)]
-    internal class LegacyProjectEngineFactory_2_0 : IProjectEngineFactory
-    {
-        private const string AssemblyName = "Microsoft.AspNetCore.Mvc.Razor.Extensions";
-        public RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
-        {
-            // Rewrite the assembly name into a full name just like this one, but with the name of the MVC design time assembly.
-            var assemblyName = new AssemblyName(typeof(LegacyProjectEngineFactory_2_0).Assembly.FullName);
-            assemblyName.Name = AssemblyName;
-
-            var extension = new AssemblyExtension(configuration.ConfigurationName, Assembly.Load(assemblyName));
-            var initializer = extension.CreateInitializer();
-
-            return RazorProjectEngine.Create(configuration, fileSystem, b =>
-            {
-                initializer.Initialize(b);
-                configure?.Invoke(b);
-            });
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_2_1.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_2_1.cs
deleted file mode 100644
index df8d04667ccf..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_2_1.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Reflection;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    // Currently we provide a fixed configuration for 2.1, but this is a point-in-time issue. We plan
-    // to make the 2.1 configuration more flexible and less hardcoded.
-    [ExportCustomProjectEngineFactory("MVC-2.1", SupportsSerialization = true)]
-    internal class LegacyProjectEngineFactory_2_1 : IProjectEngineFactory
-    {
-        private const string AssemblyName = "Microsoft.AspNetCore.Mvc.Razor.Extensions";
-        public RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
-        {
-            // Rewrite the assembly name into a full name just like this one, but with the name of the MVC design time assembly.
-            var assemblyName = new AssemblyName(typeof(LegacyProjectEngineFactory_2_1).Assembly.FullName);
-            assemblyName.Name = AssemblyName;
-
-            var extension = new AssemblyExtension(configuration.ConfigurationName, Assembly.Load(assemblyName));
-            var initializer = extension.CreateInitializer();
-
-            return RazorProjectEngine.Create(configuration, fileSystem, b =>
-            {
-                initializer.Initialize(b);
-                configure?.Invoke(b);
-            });
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LiveShareWorkspaceProvider.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LiveShareWorkspaceProvider.cs
deleted file mode 100644
index 0eac9d38b6ce..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LiveShareWorkspaceProvider.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal abstract class LiveShareWorkspaceProvider
-    {
-        public abstract bool TryGetWorkspace(ITextBuffer textBuffer, out Workspace workspace);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj
deleted file mode 100644
index aa50d399657f..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net46</TargetFrameworks>
-    <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Visual Studio agnostic Razor design-time infrastructure.</Description>
-    <EnableApiCheck>false</EnableApiCheck>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="$(MicrosoftVisualStudioTextUIPackageVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor.Workspaces\Microsoft.CodeAnalysis.Razor.Workspaces.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ProjectPathProvider.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ProjectPathProvider.cs
deleted file mode 100644
index 396e470ff659..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/ProjectPathProvider.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal abstract class ProjectPathProvider : IWorkspaceService
-    {
-        public abstract bool TryGetProjectPath(ITextBuffer textBuffer, out string filePath);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Properties/AssemblyInfo.cs
deleted file mode 100644
index 47ff95c9117f..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Mac.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.RazorExtension, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Properties/Resources.Designer.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Properties/Resources.Designer.cs
deleted file mode 100644
index 922d049da8e2..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// <auto-generated />
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class Resources
-    {
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.VisualStudio.Editor.Razor.Resources", typeof(Resources).GetTypeInfo().Assembly);
-
-        /// <summary>
-        /// Value cannot be null or an empty string.
-        /// </summary>
-        internal static string ArgumentCannotBeNullOrEmpty
-        {
-            get => GetString("ArgumentCannotBeNullOrEmpty");
-        }
-
-        /// <summary>
-        /// Value cannot be null or an empty string.
-        /// </summary>
-        internal static string FormatArgumentCannotBeNullOrEmpty()
-            => GetString("ArgumentCannotBeNullOrEmpty");
-
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
-                }
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorCodeDocumentProvider.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorCodeDocumentProvider.cs
deleted file mode 100644
index be30691363e6..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorCodeDocumentProvider.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal abstract class RazorCodeDocumentProvider
-    {
-        public abstract bool TryGetFromDocument(TextDocument document, out RazorCodeDocument codeDocument);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs
deleted file mode 100644
index 6a2d01771657..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.ComponentModel.Composition;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Completion;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Tags;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Projection;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(CompletionProvider))]
-    [ExportMetadata("Language", LanguageNames.CSharp)]
-    internal class RazorDirectiveCompletionProvider : CompletionProvider
-    {
-        // Internal for testing
-        internal static readonly string DescriptionKey = "Razor.Description";
-
-        private static readonly IEnumerable<DirectiveDescriptor> DefaultDirectives = new[]
-        {
-            CSharpCodeParser.AddTagHelperDirectiveDescriptor,
-            CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
-            CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
-        };
-        private readonly Lazy<RazorCodeDocumentProvider> _codeDocumentProvider;
-
-        [ImportingConstructor]
-        public RazorDirectiveCompletionProvider([Import(typeof(RazorCodeDocumentProvider))] Lazy<RazorCodeDocumentProvider> codeDocumentProvider)
-        {
-            if (codeDocumentProvider == null)
-            {
-                throw new ArgumentNullException(nameof(codeDocumentProvider));
-            }
-
-            _codeDocumentProvider = codeDocumentProvider;
-        }
-
-        public override Task<CompletionDescription> GetDescriptionAsync(Document document, CompletionItem item, CancellationToken cancellationToken)
-        {
-            if (document == null)
-            {
-                throw new ArgumentNullException(nameof(document));
-            }
-
-            if (item == null)
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
-
-            var descriptionContent = new List<TaggedText>();
-            if (item.Properties.TryGetValue(DescriptionKey, out var directiveDescription))
-            {
-                var descriptionText = new TaggedText(TextTags.Text, directiveDescription);
-                descriptionContent.Add(descriptionText);
-            }
-
-            var completionDescription = CompletionDescription.Create(descriptionContent.ToImmutableArray());
-            return Task.FromResult(completionDescription);
-        }
-
-        public override Task ProvideCompletionsAsync(CompletionContext context)
-        {
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
-            // FilePath will be null when the editor is open for cases where we don't have a file on disk (C# interactive window and others).
-            if (context.Document?.FilePath == null ||
-                !context.Document.FilePath.EndsWith(".cshtml", StringComparison.OrdinalIgnoreCase))
-            {
-                // Not a Razor file.
-                return Task.CompletedTask;
-            }
-
-            var result = AddCompletionItems(context);
-
-            return result;
-        }
-
-        // We do not want this inlined because the work done in this method requires Razor.Workspaces and Razor.Language assemblies.
-        // If those two assemblies were to load you'd have them load in every C# editor completion scenario.
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private Task AddCompletionItems(CompletionContext context)
-        {
-            if (!_codeDocumentProvider.Value.TryGetFromDocument(context.Document, out var codeDocument))
-            {
-                // A Razor code document has not yet been associated with the document.
-                return Task.CompletedTask;
-            }
-
-            var syntaxTree = codeDocument.GetSyntaxTree();
-            if (syntaxTree == null)
-            {
-                // No syntax tree has been computed for the current document.
-                return Task.CompletedTask;
-            }
-
-            if (!AtDirectiveCompletionPoint(syntaxTree, context))
-            {
-                // Can't have a valid directive at the current location.
-                return Task.CompletedTask;
-            }
-
-            var completionItems = GetCompletionItems(syntaxTree);
-            context.AddItems(completionItems);
-
-            return Task.CompletedTask;
-        }
-
-        // Internal virtual for testing
-        internal virtual IEnumerable<CompletionItem> GetCompletionItems(RazorSyntaxTree syntaxTree)
-        {
-            var directives = syntaxTree.Options.Directives.Concat(DefaultDirectives);
-            var completionItems = new List<CompletionItem>();
-            foreach (var directive in directives)
-            {
-                var propertyDictionary = new Dictionary<string, string>(StringComparer.Ordinal);
-
-                if (!string.IsNullOrEmpty(directive.Description))
-                {
-                    propertyDictionary[DescriptionKey] = directive.Description;
-                }
-
-                var completionItem = CompletionItem.Create(
-                    directive.Directive,
-                    // This groups all Razor directives together
-                    sortText: "_RazorDirective_",
-                    rules: CompletionItemRules.Create(formatOnCommit: false),
-                    tags: ImmutableArray.Create(WellKnownTags.Intrinsic),
-                    properties: propertyDictionary.ToImmutableDictionary());
-                completionItems.Add(completionItem);
-            }
-
-            return completionItems;
-        }
-
-        // Internal for testing
-        internal bool AtDirectiveCompletionPoint(RazorSyntaxTree syntaxTree, CompletionContext context)
-        {
-            if (TryGetRazorSnapshotPoint(context, out var razorSnapshotPoint))
-            {
-                var change = new SourceChange(razorSnapshotPoint.Position, 0, string.Empty);
-                var owner = syntaxTree.Root.LocateOwner(change);
-
-                if (owner == null)
-                {
-                    return false;
-                }
-
-                if (owner.ChunkGenerator is ExpressionChunkGenerator &&
-                    owner.Tokens.All(IsDirectiveCompletableSymbol) &&
-                    // Do not provide IntelliSense for explicit expressions. Explicit expressions will usually look like:
-                    // [@] [(] [DateTime.Now] [)]
-                    owner.Parent?.Children.Count > 1 &&
-                    owner.Parent.Children[1] == owner)
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        protected virtual bool TryGetRazorSnapshotPoint(CompletionContext context, out SnapshotPoint snapshotPoint)
-        {
-            snapshotPoint = default(SnapshotPoint);
-
-            if (context.Document.TryGetText(out var sourceText))
-            {
-                var textSnapshot = sourceText.FindCorrespondingEditorTextSnapshot();
-                var projectionSnapshot = textSnapshot as IProjectionSnapshot;
-
-                if (projectionSnapshot == null)
-                {
-                    return false;
-                }
-
-                var mappedPoints = projectionSnapshot.MapToSourceSnapshots(context.CompletionListSpan.Start);
-                var htmlSnapshotPoints = mappedPoints.Where(p => p.Snapshot.TextBuffer.IsRazorBuffer());
-
-                if (!htmlSnapshotPoints.Any())
-                {
-                    return false;
-                }
-
-                snapshotPoint = htmlSnapshotPoints.First();
-                return true;
-            }
-
-            return false;
-        }
-
-        private static bool IsDirectiveCompletableSymbol(AspNetCore.Razor.Language.Legacy.IToken symbol)
-        {
-            if (!(symbol is CSharpToken csharpSymbol))
-            {
-                return false;
-            }
-
-            return csharpSymbol.Type == CSharpTokenType.Identifier ||
-                // Marker symbol
-                csharpSymbol.Type == CSharpTokenType.Unknown;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDocumentManager.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDocumentManager.cs
deleted file mode 100644
index 2f4dd3c577b4..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDocumentManager.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal abstract class RazorDocumentManager : ILanguageService
-    {
-        public abstract void OnTextViewOpened(ITextView textView, IEnumerable<ITextBuffer> subjectBuffers);
-
-        public abstract void OnTextViewClosed(ITextView textView, IEnumerable<ITextBuffer> subjectBuffers);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorEditorFactoryService.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorEditorFactoryService.cs
deleted file mode 100644
index 8f298aed95e6..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorEditorFactoryService.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public abstract class RazorEditorFactoryService
-    {
-        public abstract bool TryGetDocumentTracker(ITextBuffer textBuffer, out VisualStudioDocumentTracker documentTracker);
-
-        public abstract bool TryGetParser(ITextBuffer textBuffer, out VisualStudioRazorParser parser);
-
-        internal abstract bool TryGetSmartIndenter(ITextBuffer textBuffer, out BraceSmartIndenter braceSmartIndenter);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorIndentationFactsService.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorIndentationFactsService.cs
deleted file mode 100644
index 01f7e6f126dc..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorIndentationFactsService.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public abstract class RazorIndentationFactsService : ILanguageService
-    {
-        public abstract int? GetDesiredIndentation(RazorSyntaxTree syntaxTree, ITextSnapshot syntaxTreeSnapshot, ITextSnapshotLine line, int indentSize, int tabSize);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxFactsService.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxFactsService.cs
deleted file mode 100644
index fc47c8199191..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxFactsService.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public abstract class RazorSyntaxFactsService : ILanguageService
-    {
-        public abstract IReadOnlyList<ClassifiedSpan> GetClassifiedSpans(RazorSyntaxTree syntaxTree);
-
-        public abstract IReadOnlyList<TagHelperSpan> GetTagHelperSpans(RazorSyntaxTree syntaxTree);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxFactsServiceExtensions.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxFactsServiceExtensions.cs
deleted file mode 100644
index c64a0210d18f..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxFactsServiceExtensions.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public static class RazorSyntaxFactsServiceExtensions
-    {
-        public static bool IsTagHelperSpan(this RazorSyntaxFactsService syntaxFactsService, RazorSyntaxTree syntaxTree, SourceSpan span)
-        {
-            if (syntaxFactsService == null)
-            {
-                throw new ArgumentNullException(nameof(syntaxFactsService));
-            }
-
-            if (syntaxTree == null)
-            {
-                // Extra hardening for the case that tooling hasn't retrieved a SyntaxTree yet.
-                return false;
-            }
-
-            var tagHelperSpans = syntaxFactsService.GetTagHelperSpans(syntaxTree);
-            for (var i = 0; i < tagHelperSpans.Count; i++)
-            {
-                var tagHelperSpan = tagHelperSpans[i].Span;
-                if (tagHelperSpan.AbsoluteIndex == span.AbsoluteIndex &&  tagHelperSpan.Length == span.Length)
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxTreePartialParser.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxTreePartialParser.cs
deleted file mode 100644
index 377351c95909..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxTreePartialParser.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Span = Microsoft.AspNetCore.Razor.Language.Legacy.Span;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal class RazorSyntaxTreePartialParser
-    {
-        private Span _lastChangeOwner;
-        private bool _lastResultProvisional;
-
-        public RazorSyntaxTreePartialParser(RazorSyntaxTree syntaxTree)
-        {
-            if (syntaxTree == null)
-            {
-                throw new ArgumentNullException(nameof(syntaxTree));
-            }
-
-            // We mutate the existing syntax tree so we need to clone the one passed in so our mutations don't
-            // impact external state.
-            SyntaxTreeRoot = (Block)syntaxTree.Root.Clone();
-        }
-
-        // Internal for testing
-        internal Block SyntaxTreeRoot { get; }
-
-        public PartialParseResultInternal Parse(SourceChange change)
-        {
-            var result = GetPartialParseResult(change);
-
-            // Remember if this was provisionally accepted for next partial parse.
-            _lastResultProvisional = (result & PartialParseResultInternal.Provisional) == PartialParseResultInternal.Provisional;
-
-            return result;
-        }
-
-        private PartialParseResultInternal GetPartialParseResult(SourceChange change)
-        {
-            var result = PartialParseResultInternal.Rejected;
-
-            // Try the last change owner
-            if (_lastChangeOwner != null && _lastChangeOwner.EditHandler.OwnsChange(_lastChangeOwner, change))
-            {
-                var editResult = _lastChangeOwner.EditHandler.ApplyChange(_lastChangeOwner, change);
-                result = editResult.Result;
-                if ((editResult.Result & PartialParseResultInternal.Rejected) != PartialParseResultInternal.Rejected)
-                {
-                    _lastChangeOwner.ReplaceWith(editResult.EditedSpan);
-                }
-
-                return result;
-            }
-
-            // Locate the span responsible for this change
-            _lastChangeOwner = SyntaxTreeRoot.LocateOwner(change);
-
-            if (_lastResultProvisional)
-            {
-                // Last change owner couldn't accept this, so we must do a full reparse
-                result = PartialParseResultInternal.Rejected;
-            }
-            else if (_lastChangeOwner != null)
-            {
-                var editResult = _lastChangeOwner.EditHandler.ApplyChange(_lastChangeOwner, change);
-                result = editResult.Result;
-                if ((editResult.Result & PartialParseResultInternal.Rejected) != PartialParseResultInternal.Rejected)
-                {
-                    _lastChangeOwner.ReplaceWith(editResult.EditedSpan);
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorTextBufferProvider.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorTextBufferProvider.cs
deleted file mode 100644
index ed3479671b51..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorTextBufferProvider.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal abstract class RazorTextBufferProvider : ILanguageService
-    {
-        public abstract bool TryGetFromDocument(TextDocument document, out ITextBuffer textBuffer);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorTextViewConnectionListener.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorTextViewConnectionListener.cs
deleted file mode 100644
index 53a4464b459f..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorTextViewConnectionListener.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.Utilities;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    [ContentType(RazorLanguage.CoreContentType)]
-    [TextViewRole(PredefinedTextViewRoles.Document)]
-    [Export(typeof(ITextViewConnectionListener))]
-    internal class RazorTextViewConnectionListener : ITextViewConnectionListener
-    {
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly RazorDocumentManager _documentManager;
-
-        [ImportingConstructor]
-        public RazorTextViewConnectionListener(ForegroundDispatcher foregroundDispatcher, RazorDocumentManager documentManager)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (documentManager == null)
-            {
-                throw new ArgumentNullException(nameof(documentManager));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _documentManager = documentManager;
-        }
-
-        public void SubjectBuffersConnected(ITextView textView, ConnectionReason reason, IReadOnlyCollection<ITextBuffer> subjectBuffers)
-        {
-            if (textView == null)
-            {
-                throw new ArgumentException(nameof(textView));
-            }
-
-            if (subjectBuffers == null)
-            {
-                throw new ArgumentNullException(nameof(subjectBuffers));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            _documentManager.OnTextViewOpened(textView, subjectBuffers);
-        }
-
-        public void SubjectBuffersDisconnected(ITextView textView, ConnectionReason reason, IReadOnlyCollection<ITextBuffer> subjectBuffers)
-        {
-            if (textView == null)
-            {
-                throw new ArgumentException(nameof(textView));
-            }
-
-            if (subjectBuffers == null)
-            {
-                throw new ArgumentNullException(nameof(subjectBuffers));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            _documentManager.OnTextViewClosed(textView, subjectBuffers);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Resources.resx b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Resources.resx
deleted file mode 100644
index 55a253ebbe32..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Resources.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
-    <value>Value cannot be null or an empty string.</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/SpanKind.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/SpanKind.cs
deleted file mode 100644
index 8e66d134085a..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/SpanKind.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public enum SpanKind
-    {
-        Transition,
-        MetaCode,
-        Comment,
-        Code,
-        Markup,
-        None
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TagHelperCompletionService.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TagHelperCompletionService.cs
deleted file mode 100644
index 61eb7517960a..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TagHelperCompletionService.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public abstract class TagHelperCompletionService
-    {
-        public abstract AttributeCompletionResult GetAttributeCompletions(AttributeCompletionContext completionContext);
-
-        public abstract ElementCompletionResult GetElementCompletions(ElementCompletionContext completionContext);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TagHelperFactsService.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TagHelperFactsService.cs
deleted file mode 100644
index e7fd77279d32..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TagHelperFactsService.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public abstract class TagHelperFactsService
-    {
-        public abstract TagHelperBinding GetTagHelperBinding(TagHelperDocumentContext documentContext, string tagName, IEnumerable<KeyValuePair<string, string>> attributes, string parentTag, bool parentIsTagHelper);
-
-        public abstract IEnumerable<BoundAttributeDescriptor> GetBoundTagHelperAttributes(TagHelperDocumentContext documentContext, string attributeName, TagHelperBinding binding);
-
-        public abstract IReadOnlyList<TagHelperDescriptor> GetTagHelpersGivenTag(TagHelperDocumentContext documentContext, string tagName, string parentTag);
-
-        public abstract IReadOnlyList<TagHelperDescriptor> GetTagHelpersGivenParent(TagHelperDocumentContext documentContext, string parentTag);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TagHelperSpan.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TagHelperSpan.cs
deleted file mode 100644
index 15a88dee7a71..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TagHelperSpan.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public struct TagHelperSpan
-    {
-        public TagHelperSpan(SourceSpan span, TagHelperBinding binding)
-        {
-            if (binding == null)
-            {
-                throw new ArgumentNullException(nameof(binding));
-            }
-
-            Span = span;
-            Binding = binding;
-        }
-
-        public TagHelperBinding Binding { get; }
-
-        public IEnumerable<TagHelperDescriptor> TagHelpers => Binding.Descriptors;
-
-        public SourceSpan Span { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextBufferCodeDocumentProvider.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextBufferCodeDocumentProvider.cs
deleted file mode 100644
index ac05e6d91217..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextBufferCodeDocumentProvider.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal abstract class TextBufferCodeDocumentProvider
-    {
-        public abstract bool TryGetFromBuffer(ITextBuffer textBuffer, out RazorCodeDocument codeDocument);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextBufferExtensions.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextBufferExtensions.cs
deleted file mode 100644
index fcfefeb874d3..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextBufferExtensions.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Text
-{
-    internal static class TextBufferExtensions
-    {
-        public static bool IsRazorBuffer(this ITextBuffer textBuffer)
-        {
-            if (textBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(textBuffer));
-            }
-
-            return textBuffer.ContentType.IsOfType(RazorLanguage.CoreContentType);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextBufferProjectService.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextBufferProjectService.cs
deleted file mode 100644
index 30ba31714c70..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextBufferProjectService.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal abstract class TextBufferProjectService
-    {
-        public abstract object GetHostProject(ITextBuffer textBuffer);
-
-        public abstract bool IsSupportedProject(object project);
-
-        public abstract string GetProjectPath(object project);
-
-        public abstract string GetProjectName(object project);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextContentChangedEventArgsExtensions.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextContentChangedEventArgsExtensions.cs
deleted file mode 100644
index 2e274ee88576..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextContentChangedEventArgsExtensions.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.VisualStudio.Text
-{
-    internal static class TextContentChangedEventArgsExtensions
-    {
-        public static bool TextChangeOccurred(this TextContentChangedEventArgs args, out (ITextChange firstChange, ITextChange lastChange, string newText, string oldText) changeInformation)
-        {
-            if (args.Changes.Count > 0)
-            {
-                var firstChange = args.Changes[0];
-                var lastChange = args.Changes[args.Changes.Count - 1];
-                var oldLength = lastChange.OldEnd - firstChange.OldPosition;
-                var newLength = lastChange.NewEnd - firstChange.NewPosition;
-                var newText = args.After.GetText(firstChange.NewPosition, newLength);
-                var oldText = args.Before.GetText(firstChange.OldPosition, oldLength);
-
-                var wasChanged = true;
-                if (oldLength == newLength)
-                {
-                    wasChanged = !string.Equals(oldText, newText, StringComparison.Ordinal);
-                }
-
-                if (wasChanged)
-                {
-                    changeInformation = (firstChange, lastChange, newText, oldText);
-                    return true;
-                }
-            }
-
-            changeInformation = default((ITextChange, ITextChange, string, string));
-            return false;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextSnapshotProjectItem.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextSnapshotProjectItem.cs
deleted file mode 100644
index 4a605fd4a44e..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TextSnapshotProjectItem.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Text;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal class TextSnapshotProjectItem : RazorProjectItem
-    {
-        private readonly ITextSnapshot _snapshot;
-
-        public TextSnapshotProjectItem(ITextSnapshot snapshot, string projectDirectory, string relativeFilePath, string filePath)
-        {
-            if (snapshot == null)
-            {
-                throw new ArgumentNullException(nameof(snapshot));
-            }
-
-            if (string.IsNullOrEmpty(projectDirectory))
-            {
-                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(projectDirectory));
-            }
-
-            if (string.IsNullOrEmpty(relativeFilePath))
-            {
-                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(relativeFilePath));
-            }
-
-            if (string.IsNullOrEmpty(filePath))
-            {
-                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(filePath));
-            }
-
-            _snapshot = snapshot;
-            BasePath = projectDirectory;
-            FilePath = relativeFilePath;
-            PhysicalPath = filePath;
-        }
-
-        public override string BasePath { get; }
-
-        public override string FilePath { get; }
-
-        public override string PhysicalPath { get; }
-
-        public override bool Exists => true;
-
-        public override Stream Read()
-        {
-            var charArray = _snapshot.ToCharArray(0, _snapshot.Length);
-
-            // We can assume UTF8 because the call path that reads from RazorProjectItem => SourceDocument
-            // can't determine the encoding and always assumes Encoding.UTF8. This is something that we might
-            // want to revisit in the future.
-            var bytes = Encoding.UTF8.GetBytes(charArray);
-            var memoryStream = new MemoryStream(bytes);
-            return memoryStream;
-        }
-    }
-
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioCompletionBroker.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioCompletionBroker.cs
deleted file mode 100644
index a86810b290d5..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioCompletionBroker.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.VisualStudio.Text.Editor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal abstract class VisualStudioCompletionBroker : ILanguageService
-    {
-        public abstract bool IsCompletionActive(ITextView textView);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioDocumentTracker.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioDocumentTracker.cs
deleted file mode 100644
index 57c46bfc5267..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioDocumentTracker.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor.Editor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public abstract class VisualStudioDocumentTracker
-    {
-        public abstract event EventHandler<ContextChangeEventArgs> ContextChanged;
-
-        public abstract RazorConfiguration Configuration { get; }
-
-        public abstract EditorSettings EditorSettings { get; }
-
-        public abstract IReadOnlyList<TagHelperDescriptor> TagHelpers { get; }
-
-        public abstract bool IsSupportedProject { get; }
-
-        public abstract string FilePath { get; }
-
-        public abstract string ProjectPath { get; }
-
-        public abstract Project Project { get; }
-
-        internal abstract ProjectSnapshot ProjectSnapshot { get; }
-
-        public abstract Workspace Workspace { get; }
-
-        public abstract ITextBuffer TextBuffer { get; }
-
-        public abstract IReadOnlyList<ITextView> TextViews { get; }
-
-        public abstract ITextView GetFocusedTextView();
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioDocumentTrackerFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioDocumentTrackerFactory.cs
deleted file mode 100644
index c17565dd7285..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioDocumentTrackerFactory.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal abstract class VisualStudioDocumentTrackerFactory : ILanguageService
-    {
-        public abstract VisualStudioDocumentTracker Create(ITextBuffer textBuffer);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioRazorParser.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioRazorParser.cs
deleted file mode 100644
index c1d71a6111f2..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioRazorParser.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public abstract class VisualStudioRazorParser
-    {
-        public abstract event EventHandler<DocumentStructureChangedEventArgs> DocumentStructureChanged;
-
-        public abstract string FilePath { get; }
-
-        public abstract RazorCodeDocument CodeDocument { get; }
-
-        public abstract ITextSnapshot Snapshot { get; }
-
-        public abstract ITextBuffer TextBuffer { get; }
-
-        public abstract bool HasPendingChanges { get; }
-
-        public abstract void QueueReparse();
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioRazorParserFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioRazorParserFactory.cs
deleted file mode 100644
index 7d30a460271d..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioRazorParserFactory.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis.Host;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal abstract class VisualStudioRazorParserFactory : ILanguageService
-    {
-        public abstract VisualStudioRazorParser Create(VisualStudioDocumentTracker documentTracker);
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioWorkspaceAccessor.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioWorkspaceAccessor.cs
deleted file mode 100644
index 70016569c226..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/VisualStudioWorkspaceAccessor.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    internal abstract class VisualStudioWorkspaceAccessor
-    {
-        public abstract bool TryGetWorkspace(ITextBuffer textBuffer, out Workspace workspace);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultVisualStudioWorkspaceAccessor.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultVisualStudioWorkspaceAccessor.cs
deleted file mode 100644
index 64171020a8aa..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultVisualStudioWorkspaceAccessor.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.ComponentModel.Composition;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Editor.Razor;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Projection;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(VisualStudioWorkspaceAccessor))]
-    internal class DefaultVisualStudioWorkspaceAccessor : VisualStudioWorkspaceAccessor
-    {
-        private readonly IBufferGraphFactoryService _bufferGraphService;
-        private readonly TextBufferProjectService _projectService;
-        private readonly Workspace _defaultWorkspace;
-        private readonly LiveShareWorkspaceProvider _liveShareWorkspaceProvider;
-
-        [ImportingConstructor]
-        public DefaultVisualStudioWorkspaceAccessor(
-            IBufferGraphFactoryService bufferGraphService,
-            TextBufferProjectService projectService,
-            [Import(typeof(VisualStudioWorkspace))] Workspace defaultWorkspace,
-            [Import(typeof(LiveShareWorkspaceProvider), AllowDefault = true)] LiveShareWorkspaceProvider liveShareWorkspaceProvider)
-        {
-            if (bufferGraphService == null)
-            {
-                throw new ArgumentNullException(nameof(bufferGraphService));
-            }
-
-            if (projectService == null)
-            {
-                throw new ArgumentNullException(nameof(projectService));
-            }
-
-            if (defaultWorkspace == null)
-            {
-                throw new ArgumentNullException(nameof(defaultWorkspace));
-            }
-
-            _bufferGraphService = bufferGraphService;
-            _projectService = projectService;
-            _defaultWorkspace = defaultWorkspace;
-            _liveShareWorkspaceProvider = liveShareWorkspaceProvider;
-        }
-
-        public override bool TryGetWorkspace(ITextBuffer textBuffer, out Workspace workspace)
-        {
-            if (textBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(textBuffer));
-            }
-
-            // We do a best effort approach in this method to get the workspace that belongs to the TextBuffer.
-            // The approaches we take to find the workspace are:
-            //
-            // 1. If we have a live share workspace provider, ask it for the workspace.
-            // 2. Look for a C# projection buffer associated with the Razor buffer. If we can find one we let
-            //    Roslyn take control of finding the Workspace (projectionBuffer.GetWorkspace()). If not,
-            //    fall back to determining if we can use the default workspace.
-            // 3. Look to see if this ITextBuffer is associated with a host project. If we find that our Razor
-            //    buffer has a host project, we make the assumption that we should use the default VisualStudioWorkspace.
-
-            if (TryGetWorkspaceFromLiveShare(textBuffer, out workspace))
-            {
-                return true;
-            }
-
-            if (TryGetWorkspaceFromProjectionBuffer(textBuffer, out workspace))
-            {
-                return true;
-            }
-
-            if (TryGetWorkspaceFromHostProject(textBuffer, out workspace))
-            {
-                return true;
-            }
-
-            workspace = null;
-            return false;
-        }
-
-        // Internal for testing
-        internal bool TryGetWorkspaceFromLiveShare(ITextBuffer textBuffer, out Workspace workspace)
-        {
-            if (_liveShareWorkspaceProvider != null &&
-                _liveShareWorkspaceProvider.TryGetWorkspace(textBuffer, out workspace))
-            {
-                return true;
-            }
-
-            workspace = null;
-            return false;
-        }
-
-        // Internal virtual for testing
-        internal virtual bool TryGetWorkspaceFromProjectionBuffer(ITextBuffer textBuffer, out Workspace workspace)
-        {
-            var graph = _bufferGraphService.CreateBufferGraph(textBuffer);
-            var projectedCSharpBuffer = graph.GetTextBuffers(buffer => buffer.ContentType.IsOfType("CSharp")).FirstOrDefault();
-
-            if (projectedCSharpBuffer == null)
-            {
-                workspace = null;
-                return false;
-            }
-
-            workspace = projectedCSharpBuffer.GetWorkspace();
-            if (workspace == null)
-            {
-                // Couldn't resolve a workspace for the projected csharp buffer.
-                return false;
-            }
-
-            return true;
-        }
-
-        // Internal virtual for testing
-        internal virtual bool TryGetWorkspaceFromHostProject(ITextBuffer textBuffer, out Workspace workspace)
-        {
-            var project = _projectService.GetHostProject(textBuffer);
-
-            if (project == null)
-            {
-                // Could not locate a project for the given text buffer.
-                workspace = null;
-                return false;
-            }
-
-            // We have a host project, assume default workspace.
-            workspace = _defaultWorkspace;
-            return true;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/RunningDocumentTableEventSink.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/RunningDocumentTableEventSink.cs
deleted file mode 100644
index 76390ba81b3a..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/RunningDocumentTableEventSink.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.VisualStudio.Shell.Interop;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    internal class RunningDocumentTableEventSink : IVsRunningDocTableEvents3
-    {
-        private readonly VisualStudioEditorDocumentManager _documentManager;
-
-        public RunningDocumentTableEventSink(VisualStudioEditorDocumentManager documentManager)
-        {
-            if (documentManager == null)
-            {
-                throw new ArgumentNullException(nameof(documentManager));
-            }
-
-            _documentManager = documentManager;
-        }
-
-        public int OnAfterAttributeChangeEx(uint docCookie, uint grfAttribs, IVsHierarchy pHierOld, uint itemidOld, string pszMkDocumentOld, IVsHierarchy pHierNew, uint itemidNew, string pszMkDocumentNew)
-        {
-            // Document has been initialized.
-            if ((grfAttribs & (uint)__VSRDTATTRIB3.RDTA_DocumentInitialized) != 0)
-            {
-                _documentManager.DocumentOpened(docCookie);
-            }
-
-            if ((grfAttribs & (uint)__VSRDTATTRIB.RDTA_MkDocument) != 0)
-            {
-                _documentManager.DocumentRenamed(docCookie, pszMkDocumentOld, pszMkDocumentNew);
-            }
-
-            return VSConstants.S_OK;
-        }
-
-        public int OnBeforeLastDocumentUnlock(uint docCookie, uint dwRDTLockType, uint dwReadLocksRemaining, uint dwEditLocksRemaining)
-        {
-            // Document is being closed
-            if (dwReadLocksRemaining + dwEditLocksRemaining == 0)
-            {
-                _documentManager.DocumentClosed(docCookie);
-            }
-
-            return VSConstants.S_OK;
-        }
-
-        public int OnBeforeSave(uint docCookie) => VSConstants.S_OK;
-
-        public int OnAfterSave(uint docCookie) => VSConstants.S_OK;
-
-        public int OnAfterAttributeChange(uint docCookie, uint grfAttribs) => VSConstants.S_OK;
-
-        public int OnBeforeDocumentWindowShow(uint docCookie, int fFirstShow, IVsWindowFrame pFrame) => VSConstants.S_OK;
-
-        public int OnAfterDocumentWindowHide(uint docCookie, IVsWindowFrame pFrame) => VSConstants.S_OK;
-
-        public int OnAfterFirstDocumentLock(uint docCookie, uint dwRDTLockType, uint dwReadLocksRemaining, uint dwEditLocksRemaining) => VSConstants.S_OK;
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisaulStudioFileChangeTracker.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisaulStudioFileChangeTracker.cs
deleted file mode 100644
index 86e0fab955b2..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisaulStudioFileChangeTracker.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Runtime.InteropServices;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Shell.Interop;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    internal class VisualStudioFileChangeTracker : FileChangeTracker, IVsFileChangeEvents
-    {
-        private const uint FileChangeFlags = (uint)(_VSFILECHANGEFLAGS.VSFILECHG_Time | _VSFILECHANGEFLAGS.VSFILECHG_Size | _VSFILECHANGEFLAGS.VSFILECHG_Del | _VSFILECHANGEFLAGS.VSFILECHG_Add);
-
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly ErrorReporter _errorReporter;
-        private readonly IVsFileChangeEx _fileChangeService;
-        private uint _fileChangeCookie;
-
-        public override event EventHandler<FileChangeEventArgs> Changed;
-
-        public VisualStudioFileChangeTracker(
-            string filePath,
-            ForegroundDispatcher foregroundDispatcher,
-            ErrorReporter errorReporter,
-            IVsFileChangeEx fileChangeService)
-        {
-            if (string.IsNullOrEmpty(filePath))
-            {
-                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(filePath));
-            }
-
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (errorReporter == null)
-            {
-                throw new ArgumentNullException(nameof(errorReporter));
-            }
-
-            if (fileChangeService == null)
-            {
-                throw new ArgumentNullException(nameof(fileChangeService));
-            }
-
-            FilePath = filePath;
-            _foregroundDispatcher = foregroundDispatcher;
-            _errorReporter = errorReporter;
-            _fileChangeService = fileChangeService;
-            _fileChangeCookie = VSConstants.VSCOOKIE_NIL;
-        }
-
-        public override string FilePath { get; }
-
-        public override void StartListening()
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            try
-            {
-                if (_fileChangeCookie == VSConstants.VSCOOKIE_NIL)
-                {
-                    var hr = _fileChangeService.AdviseFileChange(
-                        FilePath,
-                        FileChangeFlags,
-                        this,
-                        out _fileChangeCookie);
-
-                    Marshal.ThrowExceptionForHR(hr);
-                }
-            }
-            catch (Exception exception)
-            {
-                _errorReporter.ReportError(exception);
-            }
-        }
-
-        public override void StopListening()
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            try
-            {
-                if (_fileChangeCookie != VSConstants.VSCOOKIE_NIL)
-                {
-                    var hr = _fileChangeService.UnadviseFileChange(_fileChangeCookie);
-                    Marshal.ThrowExceptionForHR(hr);
-                    _fileChangeCookie = VSConstants.VSCOOKIE_NIL;
-                }
-            }
-            catch (Exception exception)
-            {
-                _errorReporter.ReportError(exception);
-            }
-        }
-
-        public int FilesChanged(uint fileCount, string[] filePaths, uint[] fileChangeFlags)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            foreach (var fileChangeFlag in fileChangeFlags)
-            {
-                var fileChangeKind = FileChangeKind.Changed;
-                var changeFlag = (_VSFILECHANGEFLAGS)fileChangeFlag;
-                if ((changeFlag & _VSFILECHANGEFLAGS.VSFILECHG_Del) == _VSFILECHANGEFLAGS.VSFILECHG_Del)
-                {
-                    fileChangeKind = FileChangeKind.Removed;
-                }
-                else if ((changeFlag & _VSFILECHANGEFLAGS.VSFILECHG_Add) == _VSFILECHANGEFLAGS.VSFILECHG_Add)
-                {
-                    fileChangeKind = FileChangeKind.Added;
-                }
-
-                // Purposefully not passing through the file paths here because we know this change has to do with this trackers FilePath.
-                // We use that FilePath instead so any path normalization the file service did does not impact callers.
-                OnChanged(fileChangeKind);
-            }
-
-            return VSConstants.S_OK;
-        }
-
-        public int DirectoryChanged(string pszDirectory) => VSConstants.S_OK;
-
-        private void OnChanged(FileChangeKind changeKind)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (Changed == null)
-            {
-                return;
-            }
-
-            var args = new FileChangeEventArgs(FilePath, changeKind);
-            Changed.Invoke(this, args);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioEditorDocumentManager.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioEditorDocumentManager.cs
deleted file mode 100644
index ab6397d77273..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioEditorDocumentManager.cs
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.TextManager.Interop;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    // Similar to the DocumentProvider in dotnet/Roslyn - but simplified quite a bit to remove
-    // concepts that we don't need. Responsible for providing data about text changes for documents
-    // and editor open/closed state.
-    internal class VisualStudioEditorDocumentManager : EditorDocumentManagerBase
-    {
-        private readonly IVsEditorAdaptersFactoryService _editorAdaptersFactory;
-
-        private readonly IVsRunningDocumentTable4 _runningDocumentTable;
-        private readonly uint _rdtCookie;
-
-        private readonly Dictionary<uint, List<DocumentKey>> _documentsByCookie;
-        private readonly Dictionary<DocumentKey, uint> _cookiesByDocument;
-
-        public VisualStudioEditorDocumentManager(
-            ForegroundDispatcher foregroundDispatcher,
-            FileChangeTrackerFactory fileChangeTrackerFactory,
-            IVsRunningDocumentTable runningDocumentTable,
-            IVsEditorAdaptersFactoryService editorAdaptersFactory)
-            : base(foregroundDispatcher, fileChangeTrackerFactory)
-        {
-            if (runningDocumentTable == null)
-            {
-                throw new ArgumentNullException(nameof(runningDocumentTable));
-            }
-
-            if (editorAdaptersFactory == null)
-            {
-                throw new ArgumentNullException(nameof(editorAdaptersFactory));
-            }
-
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (fileChangeTrackerFactory == null)
-            {
-                throw new ArgumentNullException(nameof(fileChangeTrackerFactory));
-            }
-
-            _runningDocumentTable = (IVsRunningDocumentTable4)runningDocumentTable;
-            _editorAdaptersFactory = editorAdaptersFactory;
-            
-            var hr = runningDocumentTable.AdviseRunningDocTableEvents(new RunningDocumentTableEventSink(this), out _rdtCookie);
-            Marshal.ThrowExceptionForHR(hr);
-
-            _documentsByCookie = new Dictionary<uint, List<DocumentKey>>();
-            _cookiesByDocument = new Dictionary<DocumentKey, uint>();
-        }
-
-        protected override ITextBuffer GetTextBufferForOpenDocument(string filePath)
-        {
-            if (filePath == null)
-            {
-                throw new ArgumentNullException(nameof(filePath));
-            }
-
-            // Check if the document is already open and initialized, and associate a buffer if possible.
-            var cookie = VSConstants.VSCOOKIE_NIL;
-            ITextBuffer textBuffer = null;
-            if (_runningDocumentTable.IsMonikerValid(filePath) &&
-                ((cookie = _runningDocumentTable.GetDocumentCookie(filePath)) != VSConstants.VSCOOKIE_NIL) &&
-                (_runningDocumentTable.GetDocumentFlags(cookie) & (uint)_VSRDTFLAGS4.RDT_PendingInitialization) == 0)
-            {
-                var vsTextBuffer = ((object)_runningDocumentTable.GetDocumentData(cookie)) as VsTextBuffer;
-                textBuffer = vsTextBuffer == null ? null : _editorAdaptersFactory.GetDocumentBuffer(vsTextBuffer);
-                return textBuffer;
-            }
-
-            return null;
-        }
-
-        protected override void OnDocumentOpened(EditorDocument document)
-        {
-            var cookie = _runningDocumentTable.GetDocumentCookie(document.DocumentFilePath);
-            if (cookie != VSConstants.VSCOOKIE_NIL)
-            {
-                TrackOpenDocument(cookie, new DocumentKey(document.ProjectFilePath, document.DocumentFilePath));
-            }
-        }
-
-        protected override void OnDocumentClosed(EditorDocument document)
-        {
-            var key = new DocumentKey(document.ProjectFilePath, document.DocumentFilePath);
-            if (_cookiesByDocument.TryGetValue(key, out var cookie))
-            {
-                UntrackOpenDocument(cookie, key);
-            }
-        }
-
-        public void DocumentOpened(uint cookie)
-        {
-            ForegroundDispatcher.AssertForegroundThread();
-
-            lock (_lock)
-            {
-                // Casts avoid dynamic
-                if ((object)(_runningDocumentTable.GetDocumentData(cookie)) is IVsTextBuffer vsTextBuffer)
-                {
-                    var filePath = _runningDocumentTable.GetDocumentMoniker(cookie);
-                    if (!TryGetMatchingDocuments(filePath, out var documents))
-                    {
-                        // This isn't a document that we're interesting in.
-                        return;
-                    }
-
-                    var textBuffer = _editorAdaptersFactory.GetDataBuffer(vsTextBuffer);
-                    if (textBuffer == null)
-                    {
-                        // The text buffer has not been created yet, register to be notified when it is.
-                        VsTextBufferDataEventsSink.Subscribe(vsTextBuffer, () =>
-                        {
-                            BufferLoaded(vsTextBuffer, filePath);
-                        });
-
-                        return;
-                    }
-
-                    // It's possible that events could be fired out of order and that this is a rename.
-                    if (_documentsByCookie.ContainsKey(cookie))
-                    {
-                        DocumentClosed(cookie, exceptFilePath: filePath);
-                    }
-
-                    BufferLoaded(textBuffer, filePath, documents);
-                }
-            }
-        }
-
-        public void BufferLoaded(IVsTextBuffer vsTextBuffer, string filePath)
-        {
-            ForegroundDispatcher.AssertForegroundThread();
-            
-            var textBuffer = _editorAdaptersFactory.GetDocumentBuffer(vsTextBuffer);
-            if (textBuffer != null)
-            {
-                // We potentially waited for the editor to initialize on this code path, so requery
-                // the documents.
-                if (TryGetMatchingDocuments(filePath, out var documents))
-                {
-                    BufferLoaded(textBuffer, filePath, documents);
-                }
-            }
-        }
-
-        public void BufferLoaded(ITextBuffer textBuffer, string filePath, EditorDocument[] documents)
-        {
-            ForegroundDispatcher.AssertForegroundThread();
-
-            lock (_lock)
-            {
-                for (var i = 0; i < documents.Length; i++)
-                {
-                    DocumentOpened(filePath, textBuffer);
-                }
-            }
-        }
-
-        public void DocumentClosed(uint cookie, string exceptFilePath = null)
-        {
-            ForegroundDispatcher.AssertForegroundThread();
-
-            lock (_lock)
-            {
-                if (!_documentsByCookie.TryGetValue(cookie, out var documents))
-                {
-                    return;
-                }
-
-                // We have to deal with some complications here due to renames and event ordering and such.
-                // We we might see multiple documents open for a cookie (due to linked files), but only one of them 
-                // has been renamed. In that case, we just process the change that we know about.
-                var filePaths = new HashSet<string>(documents.Select(d => d.DocumentFilePath));
-                filePaths.Remove(exceptFilePath);
-
-                foreach (var filePath in filePaths)
-                {
-                    DocumentClosed(filePath);
-                }
-            }
-        }
-
-        public void DocumentRenamed(uint cookie, string fromFilePath, string toFilePath)
-        {
-            ForegroundDispatcher.AssertForegroundThread();
-
-            // Ignore changes is casing
-            if (FilePathComparer.Instance.Equals(fromFilePath, toFilePath))
-            {
-                return;
-            }
-
-            lock (_lock)
-            {
-                // Treat a rename as a close + reopen.
-                //
-                // Due to ordering issues, we could see a partial rename. This is why we need to pass the new
-                // file path here.
-                DocumentClosed(cookie, exceptFilePath: toFilePath);
-            }
-
-            // Try to open any existing documents that match the new name.
-            if ((_runningDocumentTable.GetDocumentFlags(cookie) & (uint)_VSRDTFLAGS4.RDT_PendingInitialization) == 0)
-            {
-                DocumentOpened(cookie);
-            }
-        }
-
-        private void TrackOpenDocument(uint cookie, DocumentKey key)
-        {
-            if (!_documentsByCookie.TryGetValue(cookie, out var documents))
-            {
-                documents = new List<DocumentKey>();
-                _documentsByCookie.Add(cookie, documents);
-            }
-
-            if (!documents.Contains(key))
-            {
-                documents.Add(key);
-            }
-
-            _cookiesByDocument[key] = cookie;
-        }
-
-        private void UntrackOpenDocument(uint cookie, DocumentKey key)
-        {
-            if (_documentsByCookie.TryGetValue(cookie, out var documents))
-            {
-                documents.Remove(key);
-
-                if (documents.Count == 0)
-                {
-                    _documentsByCookie.Remove(cookie);
-                }
-            }
-
-            _cookiesByDocument.Remove(key);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioEditorDocumentManagerFactory.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioEditorDocumentManagerFactory.cs
deleted file mode 100644
index 1fd0f508d38a..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioEditorDocumentManagerFactory.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    [Shared]
-    [ExportWorkspaceServiceFactory(typeof(EditorDocumentManager), ServiceLayer.Host)]
-    internal class VisualStudioEditorDocumentManagerFactory : IWorkspaceServiceFactory
-    {
-        private readonly SVsServiceProvider _serviceProvider;
-        private readonly IVsEditorAdaptersFactoryService _editorAdaptersFactory;
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-
-        [ImportingConstructor]
-        public VisualStudioEditorDocumentManagerFactory(
-            SVsServiceProvider serviceProvider,
-            IVsEditorAdaptersFactoryService editorAdaptersFactory,
-            ForegroundDispatcher foregroundDispatcher)
-        {
-            if (serviceProvider == null)
-            {
-                throw new ArgumentNullException(nameof(serviceProvider));
-            }
-
-            if (editorAdaptersFactory == null)
-            {
-                throw new ArgumentNullException(nameof(editorAdaptersFactory));
-            }
-
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            _serviceProvider = serviceProvider;
-            _editorAdaptersFactory = editorAdaptersFactory;
-            _foregroundDispatcher = foregroundDispatcher;
-        }
-
-        public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
-        {
-            if (workspaceServices == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceServices));
-            }
-
-            var runningDocumentTable = (IVsRunningDocumentTable)_serviceProvider.GetService(typeof(SVsRunningDocumentTable));
-            var fileChangeTrackerFactory = workspaceServices.GetRequiredService<FileChangeTrackerFactory>();
-            return new VisualStudioEditorDocumentManager(_foregroundDispatcher, fileChangeTrackerFactory, runningDocumentTable, _editorAdaptersFactory);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioFileChangeTrackerFactory.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioFileChangeTrackerFactory.cs
deleted file mode 100644
index 820d79fbbe9f..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioFileChangeTrackerFactory.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Shell.Interop;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    internal class VisualStudioFileChangeTrackerFactory : FileChangeTrackerFactory
-    {
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly ErrorReporter _errorReporter;
-        private readonly IVsFileChangeEx _fileChangeService;
-
-        public VisualStudioFileChangeTrackerFactory(
-            ForegroundDispatcher foregroundDispatcher,
-            ErrorReporter errorReporter, 
-            IVsFileChangeEx fileChangeService)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (errorReporter == null)
-            {
-                throw new ArgumentNullException(nameof(errorReporter));
-            }
-
-            if (fileChangeService == null)
-            {
-                throw new ArgumentNullException(nameof(fileChangeService));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _errorReporter = errorReporter;
-            _fileChangeService = fileChangeService;
-        }
-
-        public override FileChangeTracker Create(string filePath)
-        {
-            if (string.IsNullOrEmpty(filePath))
-            {
-                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(filePath));
-            }
-
-            var fileChangeTracker = new VisualStudioFileChangeTracker(filePath, _foregroundDispatcher, _errorReporter, _fileChangeService);
-            return fileChangeTracker;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioFileChangeTrackerFactoryFactory.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioFileChangeTrackerFactoryFactory.cs
deleted file mode 100644
index 705f1b3e52ce..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioFileChangeTrackerFactoryFactory.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    [Shared]
-    [ExportWorkspaceServiceFactory(typeof(FileChangeTrackerFactory), ServiceLayer.Host)]
-    internal class VisualStudioFileChangeTrackerFactoryFactory : IWorkspaceServiceFactory
-    {
-        private readonly IVsFileChangeEx _fileChangeService;
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-
-        [ImportingConstructor]
-        public VisualStudioFileChangeTrackerFactoryFactory(ForegroundDispatcher foregroundDispatcher, SVsServiceProvider serviceProvider)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (serviceProvider == null)
-            {
-                throw new ArgumentNullException(nameof(serviceProvider));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _fileChangeService = serviceProvider.GetService(typeof(SVsFileChangeEx)) as IVsFileChangeEx;
-        }
-        public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
-        {
-            if (workspaceServices == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceServices));
-            }
-
-            var errorReporter = workspaceServices.GetRequiredService<ErrorReporter>();
-            return new VisualStudioFileChangeTrackerFactory(_foregroundDispatcher, errorReporter, _fileChangeService);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VsTextBufferDataEventsSink.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VsTextBufferDataEventsSink.cs
deleted file mode 100644
index c629f929d508..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VsTextBufferDataEventsSink.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.VisualStudio.OLE.Interop;
-using Microsoft.VisualStudio.TextManager.Interop;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    internal class VsTextBufferDataEventsSink : IVsTextBufferDataEvents
-    {
-        private readonly Action _action;
-        private readonly IConnectionPoint _connectionPoint;
-        private uint _cookie;
-        
-        public static void Subscribe(IVsTextBuffer vsTextBuffer, Action action)
-        {
-            if (vsTextBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(vsTextBuffer));
-            }
-
-            if (action == null)
-            {
-                throw new ArgumentNullException(nameof(action));
-            }
-
-            var connectionPointContainer = (IConnectionPointContainer)vsTextBuffer;
-
-            var guid = typeof(IVsTextBufferDataEvents).GUID;
-            connectionPointContainer.FindConnectionPoint(ref guid, out var connectionPoint);
-
-            var sink = new VsTextBufferDataEventsSink(connectionPoint, action);
-            connectionPoint.Advise(sink, out sink._cookie);
-        }
-
-        private VsTextBufferDataEventsSink(IConnectionPoint connectionPoint, Action action)
-        {
-            _connectionPoint = connectionPoint;
-            _action = action;
-        }
-
-        public void OnFileChanged(uint grfChange, uint dwFileAttrs)
-        {
-            // ignore
-        }
-
-        public int OnLoadCompleted(int fReload)
-        {
-            _connectionPoint.Unadvise(_cookie);
-            _action();
-
-            return VSConstants.S_OK;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Editor/DefaultTextBufferProjectService.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Editor/DefaultTextBufferProjectService.cs
deleted file mode 100644
index aeafcec34533..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Editor/DefaultTextBufferProjectService.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.ComponentModel.Composition;
-using System.Diagnostics;
-using Microsoft.VisualStudio.Editor.Razor;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor.Editor
-{
-    /// <summary>
-    /// Infrastructure methods to find project information from an <see cref="ITextBuffer"/>.
-    /// </summary>
-    [System.Composition.Shared]
-    [Export(typeof(TextBufferProjectService))]
-    internal class DefaultTextBufferProjectService : TextBufferProjectService
-    {
-        private const string DotNetCoreCapability = "(CSharp|VB)&CPS";
-
-        private readonly RunningDocumentTable _documentTable;
-        private readonly ITextDocumentFactoryService _documentFactory;
-
-        [ImportingConstructor]
-        public DefaultTextBufferProjectService(
-            [Import(typeof(SVsServiceProvider))] IServiceProvider services,
-            ITextDocumentFactoryService documentFactory)
-        {
-            if (services == null)
-            {
-                throw new ArgumentNullException(nameof(services));
-            }
-
-            if (documentFactory == null)
-            {
-                throw new ArgumentNullException(nameof(documentFactory));
-            }
-
-            _documentFactory = documentFactory;
-            _documentTable = new RunningDocumentTable(services);
-        }
-
-        public override object GetHostProject(ITextBuffer textBuffer)
-        {
-            if (textBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(textBuffer));
-            }
-
-            // If there's no document we can't find the FileName, or look for a matching hierarchy.
-            if (!_documentFactory.TryGetTextDocument(textBuffer, out var textDocument))
-            {
-                return null;
-            }
-
-            _documentTable.FindDocument(textDocument.FilePath, out var hierarchy, out uint itemId, out uint cookie);
-
-            // We don't currently try to look a Roslyn ProjectId at this point, we just want to know some
-            // basic things.
-            // See https://github.com/dotnet/roslyn/blob/4e3db2b7a0732d45a720e9ed00c00cd22ab67a14/src/VisualStudio/Core/SolutionExplorerShim/HierarchyItemToProjectIdMap.cs#L47
-            // for a more complete implementation.
-            return hierarchy;
-        }
-
-        public override string GetProjectPath(object project)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            var hierarchy = project as IVsHierarchy;
-            Debug.Assert(hierarchy != null);
-
-            ErrorHandler.ThrowOnFailure(((IVsProject)hierarchy).GetMkDocument((uint)VSConstants.VSITEMID.Root, out var path), VSConstants.E_NOTIMPL);
-            return path;
-        }
-
-        public override bool IsSupportedProject(object project)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            var hierarchy = project as IVsHierarchy;
-            Debug.Assert(hierarchy != null);
-
-            try
-            {
-                return hierarchy.IsCapabilityMatch(DotNetCoreCapability);
-            }
-            catch (NotSupportedException)
-            {
-                // IsCapabilityMatch throws a NotSupportedException if it can't create a BooleanSymbolExpressionEvaluator COM object
-            }
-            catch (ObjectDisposedException)
-            {
-                // IsCapabilityMatch throws an ObjectDisposedException if the underlying hierarchy has been disposed.
-            }
-
-            return false;
-        }
-
-        public override string GetProjectName(object project)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            var hierarchy = project as IVsHierarchy;
-            Debug.Assert(hierarchy != null);
-
-            if (ErrorHandler.Failed(hierarchy.GetProperty((uint)VSConstants.VSITEMID.Root, (int)__VSHPROPID.VSHPROPID_Name, out var name)))
-            {
-                return null;
-            }
-
-            return (string)name;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Editor/DefaultVisualStudioCompletionBroker.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Editor/DefaultVisualStudioCompletionBroker.cs
deleted file mode 100644
index 577035aa9d61..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Editor/DefaultVisualStudioCompletionBroker.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.VisualStudio.Editor.Razor;
-using Microsoft.VisualStudio.Language.Intellisense;
-using Microsoft.VisualStudio.Text.Editor;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor.Editor
-{
-    internal class DefaultVisualStudioCompletionBroker : VisualStudioCompletionBroker
-    {
-        private readonly ICompletionBroker _completionBroker;
-
-        public DefaultVisualStudioCompletionBroker(ICompletionBroker completionBroker)
-        {
-            if (completionBroker == null)
-            {
-                throw new ArgumentNullException(nameof(completionBroker));
-            }
-
-            _completionBroker = completionBroker;
-        }
-
-        public override bool IsCompletionActive(ITextView textView)
-        {
-            if (textView == null)
-            {
-                throw new ArgumentNullException(nameof(textView));
-            }
-
-            var completionIsActive = _completionBroker.IsCompletionActive(textView);
-            return completionIsActive;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Editor/DefaultVisualStudioCompletionBrokerFactory.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Editor/DefaultVisualStudioCompletionBrokerFactory.cs
deleted file mode 100644
index f0c6086f99e8..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Editor/DefaultVisualStudioCompletionBrokerFactory.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Editor.Razor;
-using Microsoft.VisualStudio.Language.Intellisense;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor.Editor
-{
-    [Shared]
-    [ExportLanguageServiceFactory(typeof(VisualStudioCompletionBroker), RazorLanguage.Name, ServiceLayer.Default)]
-    internal class DefaultVisualStudioCompletionBrokerFactory : ILanguageServiceFactory
-    {
-        private readonly ICompletionBroker _completionBroker;
-
-        [ImportingConstructor]
-        public DefaultVisualStudioCompletionBrokerFactory(ICompletionBroker completionBroker)
-        {
-            if (completionBroker == null)
-            {
-                throw new ArgumentNullException(nameof(completionBroker));
-            }
-
-            _completionBroker = completionBroker;
-        }
-
-        public ILanguageService CreateLanguageService(HostLanguageServices languageServices)
-        {
-            if (languageServices == null)
-            {
-                throw new ArgumentNullException(nameof(languageServices));
-            }
-
-            return new DefaultVisualStudioCompletionBroker(_completionBroker);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
deleted file mode 100644
index 32296b51c682..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
+++ /dev/null
@@ -1,142 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net46</TargetFrameworks>
-    <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure for Visual Studio.</Description>
-    <EnableApiCheck>false</EnableApiCheck>
-    <RulesDirectory>..\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Rules\</RulesDirectory>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <DefineConstants>$(DefineConstants);RAZOR_EXTENSION_DEVELOPER_MODE</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="$(MicrosoftVisualStudioComponentModelHostPackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Editor" Version="$(MicrosoftVisualStudioEditorPackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="$(MicrosoftVisualStudioLanguageIntellisensePackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient" Version="$(VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.LanguageServices" Version="$(VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.OLE.Interop" Version="$(MicrosoftVisualStudioOLEInteropPackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Analyzers" Version="$(MicrosoftVisualStudioProjectSystemAnalyzersPackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Managed.VS" Version="$(MicrosoftVisualStudioProjectSystemManagedVSPackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.ProjectSystem.SDK" Version="$(MicrosoftVisualStudioProjectSystemSDKPackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(MicrosoftVisualStudioShell150PackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.10.0" Version="$(MicrosoftVisualStudioShellInterop100PackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="$(MicrosoftVisualStudioShellInterop110PackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.12.0" Version="$(MicrosoftVisualStudioShellInterop120PackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.8.0" Version="$(MicrosoftVisualStudioShellInterop80PackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.9.0" Version="$(MicrosoftVisualStudioShellInterop90PackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop" Version="$(MicrosoftVisualStudioShellInteropPackageVersion)" />
-
-    <!-- We need to use this version of Json.Net to maintain consistency with Visual Studio. -->
-    <PackageReference Include="Newtonsoft.Json" Version="$(VisualStudio_NewtonsoftJsonPackageVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Editor.Razor\Microsoft.VisualStudio.Editor.Razor.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Xaml" />
-  </ItemGroup>
-  
-  <!-- Workaround for Microsoft.VisualStudio.SDK.EmbedInteropTypes not working correctly-->
-  <Target Name="_EmbeddedAssemblyWorkaround" DependsOnTargets="ResolveReferences" BeforeTargets="FindReferenceAssembliesForReferences">
-    <ItemGroup>
-      <ReferencePath Condition="'%(FileName)'=='Microsoft.VisualStudio.Shell.Interop.11.0'">
-        <EmbedInteropTypes>false</EmbedInteropTypes>
-      </ReferencePath>
-    </ItemGroup>
-  </Target>
-
-  <!--
-    The ProjectSystem.SDK tasks that handle XamlPropertyRule don't work on the dotnet core version
-    of MSBuild. The workaround here is to only hardcode the generated code location such that it gets
-    checked in. Then we don't need to generate it at build time.
-    If you make changes to the rule files, then you need to update them using Desktop MSBuild :(
-  -->
-  <ItemGroup Condition="'$(MSBuildRuntimeType)'=='Core'">
-    <None Include="$(RulesDirectory)RazorConfiguration.xaml">
-      <Link>ProjectSystem\Rules\RazorConfiguration.xaml</Link>
-    </None>
-    <None Include="$(RulesDirectory)RazorExtension.xaml">
-      <Link>ProjectSystem\Rules\RazorExtension.xaml</Link>
-    </None>
-    <None Include="$(RulesDirectory)RazorGeneral.xaml">
-      <Link>ProjectSystem\Rules\RazorGeneral.xaml</Link>
-    </None>
-    <None Include="$(RulesDirectory)RazorGenerateWithTargetPath.xaml">
-      <Link>ProjectSystem\Rules\RazorGenerateWithTargetPath.xaml</Link>
-    </None>
-    <EmbeddedResource Include="$(RulesDirectory)RazorConfiguration.xaml">
-      <LogicalName>XamlRuleToCode:RazorConfiguration.xaml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="$(RulesDirectory)RazorExtension.xaml">
-      <LogicalName>XamlRuleToCode:RazorExtension.xaml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="$(RulesDirectory)RazorGeneral.xaml">
-      <LogicalName>XamlRuleToCode:RazorGeneral.xaml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="$(RulesDirectory)RazorGenerateWithTargetPath.xaml">
-      <LogicalName>XamlRuleToCode:RazorGenerateWithTargetPath.xaml</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup Condition="'$(MSBuildRuntimeType)'!='Core'">
-    <XamlPropertyRule Include="$(RulesDirectory)RazorConfiguration.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
-      <Namespace>Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules</Namespace>
-      <RuleInjectionClassName>RazorProjectProperties</RuleInjectionClassName>
-      <Context></Context>
-      <OutputPath>ProjectSystem\Rules\</OutputPath>
-    </XamlPropertyRule>
-    <XamlPropertyRule Include="$(RulesDirectory)RazorExtension.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
-      <Namespace>Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules</Namespace>
-      <RuleInjectionClassName>RazorProjectProperties</RuleInjectionClassName>
-      <OutputPath>ProjectSystem\Rules\</OutputPath>
-    </XamlPropertyRule>
-    <XamlPropertyRule Include="$(RulesDirectory)RazorGeneral.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
-      <Namespace>Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules</Namespace>
-      <RuleInjectionClassName>RazorProjectProperties</RuleInjectionClassName>
-      <OutputPath>ProjectSystem\Rules\</OutputPath>
-    </XamlPropertyRule>
-    <XamlPropertyRule Include="$(RulesDirectory)RazorGenerateWithTargetPath.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
-      <Namespace>Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules</Namespace>
-      <RuleInjectionClassName>RazorProjectProperties</RuleInjectionClassName>
-      <OutputPath>ProjectSystem\Rules\</OutputPath>
-    </XamlPropertyRule>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="ProjectSystem\Rules\RazorConfiguration.cs">
-      <DependentUpon>ProjectSystem\Rules\RazorConfiguration.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="ProjectSystem\Rules\RazorExtension.cs">
-      <DependentUpon>ProjectSystem\Rules\RazorExtension.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="ProjectSystem\Rules\RazorGeneral.cs">
-      <DependentUpon>ProjectSystem\Rules\RazorGeneral.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="ProjectSystem\Rules\RazorGenerateWithTargetPath.cs">
-      <DependentUpon>ProjectSystem\Rules\RazorGenerateWithTargetPath.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <!--
-    Despite us specifying %(XamlPropertyRule.OutputPath), the ProjectSystem.SDK targets still add files in the 
-    obj folder to the Compile group. This is a workaround to remove them.
-  -->
-  <Target Name="GrossProjectSystemSDKWorkaround" AfterTargets="GenerateRulePrep">
-    <ItemGroup>
-      <Compile Remove="@(XamlPropertyRule->'$(IntermediateOutputPath)%(FileName)$(DefaultLanguageSourceExtension)')" />
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/OOPTagHelperResolver.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/OOPTagHelperResolver.cs
deleted file mode 100644
index 2abee409b9e6..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/OOPTagHelperResolver.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Editor.Razor;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor
-{
-    internal class OOPTagHelperResolver : TagHelperResolver
-    {
-        private readonly DefaultTagHelperResolver _defaultResolver;
-        private readonly ProjectSnapshotProjectEngineFactory _factory;
-        private readonly ErrorReporter _errorReporter;
-        private readonly Workspace _workspace;
-
-        public OOPTagHelperResolver(ProjectSnapshotProjectEngineFactory factory, ErrorReporter errorReporter, Workspace workspace)
-        {
-            if (factory == null)
-            {
-                throw new ArgumentNullException(nameof(factory));
-            }
-
-            if (errorReporter == null)
-            {
-                throw new ArgumentNullException(nameof(errorReporter));
-            }
-
-            if (workspace == null)
-            {
-                throw new ArgumentNullException(nameof(workspace));
-            }
-
-            _factory = factory;
-            _errorReporter = errorReporter;
-            _workspace = workspace;
-
-            _defaultResolver = new DefaultTagHelperResolver();
-        }
-
-        public override async Task<TagHelperResolutionResult> GetTagHelpersAsync(ProjectSnapshot project, CancellationToken cancellationToken = default)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            if (project.Configuration == null || project.WorkspaceProject == null)
-            {
-                return TagHelperResolutionResult.Empty;
-            }
-
-            // Not every custom factory supports the OOP host. Our priority system should work like this:
-            //
-            // 1. Use custom factory out of process
-            // 2. Use custom factory in process
-            // 3. Use fallback factory in process
-            //
-            // Calling into RazorTemplateEngineFactoryService.Create will accomplish #2 and #3 in one step.
-            var factory = _factory.FindSerializableFactory(project);
-
-            try
-            {
-                TagHelperResolutionResult result = null;
-                if (factory != null)
-                {
-                    result = await ResolveTagHelpersOutOfProcessAsync(factory, project);
-                }
-
-                if (result == null)
-                {
-                    // Was unable to get tag helpers OOP, fallback to default behavior.
-                    result = await ResolveTagHelpersInProcessAsync(project);
-                }
-
-                return result;
-            }
-            catch (Exception exception)
-            {
-                throw new InvalidOperationException(
-                    Resources.FormatUnexpectedException(
-                        typeof(DefaultTagHelperResolver).FullName,
-                        nameof(GetTagHelpersAsync)),
-                    exception);
-            }
-        }
-
-        protected virtual async Task<TagHelperResolutionResult> ResolveTagHelpersOutOfProcessAsync(IProjectEngineFactory factory, ProjectSnapshot project)
-        {
-            // We're being overly defensive here because the OOP host can return null for the client/session/operation
-            // when it's disconnected (user stops the process).
-            //
-            // This will change in the future to an easier to consume API but for VS RTM this is what we have.
-            try
-            {
-                var client = await RazorLanguageServiceClientFactory.CreateAsync(_workspace, CancellationToken.None);
-                if (client != null)
-                {
-                    using (var session = await client.CreateSessionAsync(project.WorkspaceProject.Solution))
-                    {
-                        if (session != null)
-                        {
-                            var args = new object[]
-                            {
-                                Serialize(project),
-                                factory == null ? null : factory.GetType().AssemblyQualifiedName,
-                            };
-
-                            var json = await session.InvokeAsync<JObject>("GetTagHelpersAsync", args, CancellationToken.None).ConfigureAwait(false);
-                            return Deserialize(json);
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                // We silence exceptions from the OOP host because we don't want to bring down VS for an OOP failure.
-                // We will retry all failures in process anyway, so if there's a real problem that isn't unique to OOP
-                // then it will report a crash in VS.
-                _errorReporter.ReportError(ex, project);
-            }
-
-            return null;
-        }
-
-        protected virtual Task<TagHelperResolutionResult> ResolveTagHelpersInProcessAsync(ProjectSnapshot project)
-        {
-            return _defaultResolver.GetTagHelpersAsync(project);
-        }
-
-        private JObject Serialize(ProjectSnapshot snapshot)
-        {
-            var serializer = new JsonSerializer();
-            serializer.Converters.RegisterRazorConverters();
-
-            return JObject.FromObject(snapshot, serializer);
-        }
-
-        private TagHelperResolutionResult Deserialize(JObject jsonObject)
-        {
-            var serializer = new JsonSerializer();
-            serializer.Converters.RegisterRazorConverters();
-
-            using (var reader = jsonObject.CreateReader())
-            {
-                return serializer.Deserialize<TagHelperResolutionResult>(reader);
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/OOPTagHelperResolverFactory.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/OOPTagHelperResolverFactory.cs
deleted file mode 100644
index 0d588c6cc85d..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/OOPTagHelperResolverFactory.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Editor.Razor;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor
-{
-    [ExportLanguageServiceFactory(typeof(TagHelperResolver), RazorLanguage.Name, ServiceLayer.Host)]
-    internal class OOPTagHelperResolverFactory : ILanguageServiceFactory
-    {
-        public ILanguageService CreateLanguageService(HostLanguageServices languageServices)
-        {
-            return new OOPTagHelperResolver(
-                languageServices.WorkspaceServices.GetRequiredService<ProjectSnapshotProjectEngineFactory>(),
-                languageServices.WorkspaceServices.GetRequiredService<ErrorReporter>(),
-                languageServices.WorkspaceServices.Workspace);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/DefaultRazorProjectHost.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/DefaultRazorProjectHost.cs
deleted file mode 100644
index 68dfc4312a4d..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/DefaultRazorProjectHost.cs
+++ /dev/null
@@ -1,352 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.ComponentModel.Composition;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Threading.Tasks.Dataflow;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.VisualStudio.LanguageServices;
-using Microsoft.VisualStudio.ProjectSystem;
-using Microsoft.VisualStudio.ProjectSystem.Properties;
-using Item = System.Collections.Generic.KeyValuePair<string, System.Collections.Immutable.IImmutableDictionary<string, string>>;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    // Somewhat similar to https://github.com/dotnet/project-system/blob/fa074d228dcff6dae9e48ce43dd4a3a5aa22e8f0/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/LanguageServices/LanguageServiceHost.cs
-    //
-    // This class is responsible for intializing the Razor ProjectSnapshotManager for cases where
-    // MSBuild provides configuration support (>= 2.1).
-    [AppliesTo("DotNetCoreRazor & DotNetCoreRazorConfiguration")]
-    [Export(ExportContractNames.Scopes.UnconfiguredProject, typeof(IProjectDynamicLoadComponent))]
-    internal class DefaultRazorProjectHost : RazorProjectHostBase
-    {
-        private IDisposable _subscription;
-
-        [ImportingConstructor]
-        public DefaultRazorProjectHost(
-            IUnconfiguredProjectCommonServices commonServices,
-            [Import(typeof(VisualStudioWorkspace))] Workspace workspace)
-            : base(commonServices, workspace)
-        {
-        }
-
-        // Internal for testing
-        internal DefaultRazorProjectHost(
-            IUnconfiguredProjectCommonServices commonServices,
-             Workspace workspace,
-             ProjectSnapshotManagerBase projectManager)
-            : base(commonServices, workspace, projectManager)
-        {
-        }
-
-        protected override async Task InitializeCoreAsync(CancellationToken cancellationToken)
-        {
-            await base.InitializeCoreAsync(cancellationToken).ConfigureAwait(false);
-
-            // Don't try to evaluate any properties here since the project is still loading and we require access
-            // to the UI thread to push our updates.
-            //
-            // Just subscribe and handle the notification later.
-            // Don't try to evaluate any properties here since the project is still loading and we require access
-            // to the UI thread to push our updates.
-            //
-            // Just subscribe and handle the notification later.
-            var receiver = new ActionBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>>(OnProjectChanged);
-            _subscription = CommonServices.ActiveConfiguredProjectSubscription.JointRuleSource.SourceBlock.LinkTo(
-                receiver,
-                initialDataAsNew: true,
-                suppressVersionOnlyUpdates: true,
-                ruleNames: new string[]
-                {
-                    Rules.RazorGeneral.SchemaName,
-                    Rules.RazorConfiguration.SchemaName,
-                    Rules.RazorExtension.SchemaName,
-                    Rules.RazorGenerateWithTargetPath.SchemaName,
-                });
-        }
-
-        protected override async Task DisposeCoreAsync(bool initialized)
-        {
-            await base.DisposeCoreAsync(initialized).ConfigureAwait(false);
-
-            if (initialized)
-            {
-                _subscription.Dispose();
-            }
-        }
-
-        // Internal for testing
-        internal async Task OnProjectChanged(IProjectVersionedValue<IProjectSubscriptionUpdate> update)
-        {
-            if (IsDisposing || IsDisposed)
-            {
-                return;
-            }
-
-            await CommonServices.TasksService.LoadedProjectAsync(async () =>
-            {
-                await ExecuteWithLock(async () =>
-                {
-                    if (TryGetConfiguration(update.Value.CurrentState, out var configuration))
-                    {
-                        var hostProject = new HostProject(CommonServices.UnconfiguredProject.FullPath, configuration);
-
-                        // We need to deal with the case where the project was uninitialized, but now
-                        // is valid for Razor. In that case we might have previously seen all of the documents
-                        // but ignored them because the project wasn't active.
-                        //
-                        // So what we do to deal with this, is that we 'remove' all changed and removed items
-                        // and then we 'add' all current items. This allows minimal churn to the PSM, but still
-                        // makes us up to date.
-                        var documents = GetCurrentDocuments(update.Value);
-                        var changedDocuments = GetChangedAndRemovedDocuments(update.Value);
-
-                        await UpdateAsync(() =>
-                        {
-                            UpdateProjectUnsafe(hostProject);
-
-                            for (var i = 0; i < changedDocuments.Length; i++)
-                            {
-                                RemoveDocumentUnsafe(changedDocuments[i]);
-                            }
-
-                            for (var i = 0; i < documents.Length; i++)
-                            {
-                                AddDocumentUnsafe(documents[i]);
-                            }
-                        }).ConfigureAwait(false);
-                    }
-                    else
-                    {
-                        // Ok we can't find a configuration. Let's assume this project isn't using Razor then.
-                        await UpdateAsync(UninitializeProjectUnsafe).ConfigureAwait(false);
-                    }
-                });
-            }, registerFaultHandler: true);
-        }
-
-        // Internal for testing
-        internal static bool TryGetConfiguration(
-            IImmutableDictionary<string, IProjectRuleSnapshot> state,
-            out RazorConfiguration configuration)
-        {
-            if (!TryGetDefaultConfiguration(state, out var defaultConfiguration))
-            {
-                configuration = null;
-                return false;
-            }
-
-            if (!TryGetLanguageVersion(state, out var languageVersion))
-            {
-                configuration = null;
-                return false;
-            }
-
-            if (!TryGetConfigurationItem(defaultConfiguration, state, out var configurationItem))
-            {
-                configuration = null;
-                return false;
-            }
-
-            if (!TryGetExtensionNames(configurationItem, out var extensionNames))
-            {
-                configuration = null;
-                return false;
-            }
-
-            if (!TryGetExtensions(extensionNames, state, out var extensions))
-            {
-                configuration = null;
-                return false;
-            }
-
-            configuration = new ProjectSystemRazorConfiguration(languageVersion, configurationItem.Key, extensions);
-            return true;
-        }
-
-
-        // Internal for testing
-        internal static bool TryGetDefaultConfiguration(
-            IImmutableDictionary<string, IProjectRuleSnapshot> state,
-            out string defaultConfiguration)
-        {
-            if (!state.TryGetValue(Rules.RazorGeneral.SchemaName, out var rule))
-            {
-                defaultConfiguration = null;
-                return false;
-            }
-
-            if (!rule.Properties.TryGetValue(Rules.RazorGeneral.RazorDefaultConfigurationProperty, out defaultConfiguration))
-            {
-                defaultConfiguration = null;
-                return false;
-            }
-
-            if (string.IsNullOrEmpty(defaultConfiguration))
-            {
-                defaultConfiguration = null;
-                return false;
-            }
-
-            return true;
-        }
-
-        // Internal for testing
-        internal static bool TryGetLanguageVersion(
-            IImmutableDictionary<string, IProjectRuleSnapshot> state,
-            out RazorLanguageVersion languageVersion)
-        {
-            if (!state.TryGetValue(Rules.RazorGeneral.SchemaName, out var rule))
-            {
-                languageVersion = null;
-                return false;
-            }
-
-            if (!rule.Properties.TryGetValue(Rules.RazorGeneral.RazorLangVersionProperty, out var languageVersionValue))
-            {
-                languageVersion = null;
-                return false;
-            }
-
-            if (string.IsNullOrEmpty(languageVersionValue))
-            {
-                languageVersion = null;
-                return false;
-            }
-
-            if (!RazorLanguageVersion.TryParse(languageVersionValue, out languageVersion))
-            {
-                languageVersion = RazorLanguageVersion.Latest;
-            }
-
-            return true;
-        }
-
-        // Internal for testing
-        internal static bool TryGetConfigurationItem(
-            string configuration,
-            IImmutableDictionary<string, IProjectRuleSnapshot> state,
-            out Item configurationItem)
-        {
-            if (!state.TryGetValue(Rules.RazorConfiguration.PrimaryDataSourceItemType, out var configurationState))
-            {
-                configurationItem = default(Item);
-                return false;
-            }
-
-            var items = configurationState.Items;
-            foreach (var item in items)
-            {
-                if (item.Key == configuration)
-                {
-                    configurationItem = item;
-                    return true;
-                }
-            }
-
-            configurationItem = default(Item);
-            return false;
-        }
-
-        // Internal for testing
-        internal static bool TryGetExtensionNames(
-            Item configurationItem, 
-            out string[] configuredExtensionNames)
-        {
-            if (!configurationItem.Value.TryGetValue(Rules.RazorConfiguration.ExtensionsProperty, out var extensionNames))
-            {
-                configuredExtensionNames = null;
-                return false;
-            }
-
-            if (string.IsNullOrEmpty(extensionNames))
-            {
-                configuredExtensionNames = null;
-                return false;
-            }
-
-            configuredExtensionNames = extensionNames.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
-            return true;
-        }
-
-        // Internal for testing
-        internal static bool TryGetExtensions(
-            string[] extensionNames,
-            IImmutableDictionary<string, IProjectRuleSnapshot> state, 
-            out ProjectSystemRazorExtension[] extensions)
-        {
-            if (!state.TryGetValue(Rules.RazorExtension.PrimaryDataSourceItemType, out var rule))
-            {
-                extensions = null;
-                return false;
-            }
-
-            var items = rule.Items;
-            var extensionList = new List<ProjectSystemRazorExtension>();
-            foreach (var item in items)
-            {
-                var extensionName = item.Key;
-                if (extensionNames.Contains(extensionName))
-                {
-                    extensionList.Add(new ProjectSystemRazorExtension(extensionName));
-                }
-            }
-
-            extensions = extensionList.ToArray();
-            return true;
-        }
-
-        private HostDocument[] GetCurrentDocuments(IProjectSubscriptionUpdate update)
-        {
-            if (!update.CurrentState.TryGetValue(Rules.RazorGenerateWithTargetPath.SchemaName, out var rule))
-            {
-                return Array.Empty<HostDocument>();
-            }
-
-            var documents = new List<HostDocument>();
-            foreach (var kvp in rule.Items)
-            {
-                if (kvp.Value.TryGetValue(Rules.RazorGenerateWithTargetPath.TargetPathProperty, out var targetPath) &&
-                    !string.IsNullOrWhiteSpace(kvp.Key) &&
-                    !string.IsNullOrWhiteSpace(targetPath))
-                {
-                    var filePath = CommonServices.UnconfiguredProject.MakeRooted(kvp.Key);
-                    documents.Add(new HostDocument(filePath, targetPath));
-                }
-            }
-
-            return documents.ToArray();
-        }
-
-        private HostDocument[] GetChangedAndRemovedDocuments(IProjectSubscriptionUpdate update)
-        {
-            if (!update.ProjectChanges.TryGetValue(Rules.RazorGenerateWithTargetPath.SchemaName, out var rule))
-            {
-                return Array.Empty<HostDocument>();
-            }
-
-            var documents = new List<HostDocument>();
-            foreach (var key in rule.Difference.RemovedItems.Concat(rule.Difference.ChangedItems))
-            {
-                if (rule.Before.Items.TryGetValue(key, out var value))
-                {
-                    if (value.TryGetValue(Rules.RazorGenerateWithTargetPath.TargetPathProperty, out var targetPath) &&
-                        !string.IsNullOrWhiteSpace(key) &&
-                        !string.IsNullOrWhiteSpace(targetPath))
-                    {
-                        var filePath = CommonServices.UnconfiguredProject.MakeRooted(key);
-                        documents.Add(new HostDocument(filePath, targetPath));
-                    }
-                }
-            }
-
-            return documents.ToArray();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/FallbackRazorProjectHost.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/FallbackRazorProjectHost.cs
deleted file mode 100644
index 5dedf67af9ce..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/FallbackRazorProjectHost.cs
+++ /dev/null
@@ -1,275 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.ComponentModel.Composition;
-using System.IO;
-using System.Linq;
-using System.Reflection.Metadata;
-using System.Reflection.PortableExecutable;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Threading.Tasks.Dataflow;
-using Microsoft.VisualStudio.LanguageServices;
-using Microsoft.VisualStudio.ProjectSystem;
-using ContentItem = Microsoft.CodeAnalysis.Razor.ProjectSystem.ManagedProjectSystemSchema.ContentItem;
-using ItemReference = Microsoft.CodeAnalysis.Razor.ProjectSystem.ManagedProjectSystemSchema.ItemReference;
-using NoneItem = Microsoft.CodeAnalysis.Razor.ProjectSystem.ManagedProjectSystemSchema.NoneItem;
-using ResolvedCompilationReference = Microsoft.CodeAnalysis.Razor.ProjectSystem.ManagedProjectSystemSchema.ResolvedCompilationReference;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    // Somewhat similar to https://github.com/dotnet/project-system/blob/fa074d228dcff6dae9e48ce43dd4a3a5aa22e8f0/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/LanguageServices/LanguageServiceHost.cs
-    //
-    // This class is responsible for intializing the Razor ProjectSnapshotManager for cases where
-    // MSBuild does not provides configuration support (SDK < 2.1).
-    [AppliesTo("(DotNetCoreRazor | DotNetCoreWeb) & !DotNetCoreRazorConfiguration")]
-    [Export(ExportContractNames.Scopes.UnconfiguredProject, typeof(IProjectDynamicLoadComponent))]
-    internal class FallbackRazorProjectHost : RazorProjectHostBase
-    {
-        private const string MvcAssemblyName = "Microsoft.AspNetCore.Mvc.Razor";
-        private const string MvcAssemblyFileName = "Microsoft.AspNetCore.Mvc.Razor.dll";
-
-        private IDisposable _subscription;
-
-        [ImportingConstructor]
-        public FallbackRazorProjectHost(
-            IUnconfiguredProjectCommonServices commonServices,
-            [Import(typeof(VisualStudioWorkspace))] Workspace workspace)
-            : base(commonServices, workspace)
-        {
-        }
-
-        // Internal for testing
-        internal FallbackRazorProjectHost(
-            IUnconfiguredProjectCommonServices commonServices,
-             Workspace workspace,
-             ProjectSnapshotManagerBase projectManager)
-            : base(commonServices, workspace, projectManager)
-        {
-        }
-
-        protected override async Task InitializeCoreAsync(CancellationToken cancellationToken)
-        {
-            await base.InitializeCoreAsync(cancellationToken).ConfigureAwait(false);
-
-            // Don't try to evaluate any properties here since the project is still loading and we require access
-            // to the UI thread to push our updates.
-            //
-            // Just subscribe and handle the notification later.
-            var receiver = new ActionBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>>(OnProjectChanged);
-            _subscription = CommonServices.ActiveConfiguredProjectSubscription.JointRuleSource.SourceBlock.LinkTo(
-                receiver,
-                initialDataAsNew: true,
-                suppressVersionOnlyUpdates: true,
-                ruleNames: new string[]
-                {
-                    ResolvedCompilationReference.SchemaName,
-                    ContentItem.SchemaName,
-                    NoneItem.SchemaName,
-                },
-                linkOptions: new DataflowLinkOptions() { PropagateCompletion = true });
-        }
-
-        protected override async Task DisposeCoreAsync(bool initialized)
-        {
-            await base.DisposeCoreAsync(initialized).ConfigureAwait(false);
-
-            if (initialized)
-            {
-                _subscription.Dispose();
-            }
-        }
-
-        // Internal for testing
-        internal async Task OnProjectChanged(IProjectVersionedValue<IProjectSubscriptionUpdate> update)
-        {
-            if (IsDisposing || IsDisposed)
-            {
-                return;
-            }
-
-            await CommonServices.TasksService.LoadedProjectAsync(async () =>
-            {
-                await ExecuteWithLock(async () =>
-                {
-                    string mvcReferenceFullPath = null;
-                    if (update.Value.CurrentState.ContainsKey(ResolvedCompilationReference.SchemaName))
-                    {
-                        var references = update.Value.CurrentState[ResolvedCompilationReference.SchemaName].Items;
-                        foreach (var reference in references)
-                        {
-                            if (reference.Key.EndsWith(MvcAssemblyFileName, StringComparison.OrdinalIgnoreCase))
-                            {
-                                mvcReferenceFullPath = reference.Key;
-                                break;
-                            }
-                        }
-                    }
-
-                    if (mvcReferenceFullPath == null)
-                    {
-                        // Ok we can't find an MVC version. Let's assume this project isn't using Razor then.
-                        await UpdateAsync(UninitializeProjectUnsafe).ConfigureAwait(false);
-                        return;
-                    }
-
-                    var version = GetAssemblyVersion(mvcReferenceFullPath);
-                    if (version == null)
-                    {
-                        // Ok we can't find an MVC version. Let's assume this project isn't using Razor then.
-                        await UpdateAsync(UninitializeProjectUnsafe).ConfigureAwait(false);
-                        return;
-                    }
-
-                    var configuration = FallbackRazorConfiguration.SelectConfiguration(version);
-                    var hostProject = new HostProject(CommonServices.UnconfiguredProject.FullPath, configuration);
-
-                    // We need to deal with the case where the project was uninitialized, but now
-                    // is valid for Razor. In that case we might have previously seen all of the documents
-                    // but ignored them because the project wasn't active.
-                    //
-                    // So what we do to deal with this, is that we 'remove' all changed and removed items
-                    // and then we 'add' all current items. This allows minimal churn to the PSM, but still
-                    // makes us up-to-date.
-                    var documents = GetCurrentDocuments(update.Value);
-                    var changedDocuments = GetChangedAndRemovedDocuments(update.Value);
-
-                    await UpdateAsync(() =>
-                    {
-                        UpdateProjectUnsafe(hostProject);
-
-                        for (var i = 0; i < changedDocuments.Length; i++)
-                        {
-                            RemoveDocumentUnsafe(changedDocuments[i]);
-                        }
-
-                        for (var i = 0; i < documents.Length; i++)
-                        {
-                            AddDocumentUnsafe(documents[i]);
-                        }
-                    }).ConfigureAwait(false);
-                });
-            }, registerFaultHandler: true);
-        }
-
-        // virtual for overriding in tests
-        protected virtual Version GetAssemblyVersion(string filePath)
-        {
-            return ReadAssemblyVersion(filePath);
-        }
-
-        // Internal for testing
-        internal HostDocument[] GetCurrentDocuments(IProjectSubscriptionUpdate update)
-        {
-            var documents = new List<HostDocument>();
-
-            // Content Razor files
-            if (update.CurrentState.TryGetValue(ContentItem.SchemaName, out var rule))
-            {
-                foreach (var kvp in rule.Items)
-                {
-                    if (TryGetRazorDocument(kvp.Value, out var document))
-                    {
-                        documents.Add(document);
-                    }
-                }
-            }
-
-            // None Razor files, these are typically included when a user links a file in Visual Studio.
-            if (update.CurrentState.TryGetValue(NoneItem.SchemaName, out var nonRule))
-            {
-                foreach (var kvp in nonRule.Items)
-                {
-                    if (TryGetRazorDocument(kvp.Value, out var document))
-                    {
-                        documents.Add(document);
-                    }
-                }
-            }
-
-            return documents.ToArray();
-        }
-
-        // Internal for testing
-        internal HostDocument[] GetChangedAndRemovedDocuments(IProjectSubscriptionUpdate update)
-        {
-            var documents = new List<HostDocument>();
-
-            // Content Razor files
-            if (update.ProjectChanges.TryGetValue(ContentItem.SchemaName, out var rule))
-            {
-                foreach (var key in rule.Difference.RemovedItems.Concat(rule.Difference.ChangedItems))
-                {
-                    if (rule.Before.Items.TryGetValue(key, out var value) &&
-                        TryGetRazorDocument(value, out var document))
-                    {
-                        documents.Add(document);
-                    }
-                }
-            }
-
-            // None Razor files, these are typically included when a user links a file in Visual Studio.
-            if (update.ProjectChanges.TryGetValue(NoneItem.SchemaName, out var nonRule))
-            {
-                foreach (var key in nonRule.Difference.RemovedItems.Concat(nonRule.Difference.ChangedItems))
-                {
-                    if (nonRule.Before.Items.TryGetValue(key, out var value) &&
-                        TryGetRazorDocument(value, out var document))
-                    {
-                        documents.Add(document);
-                    }
-                }
-            }
-
-            return documents.ToArray();
-        }
-
-        // Internal for testing
-        internal bool TryGetRazorDocument(IImmutableDictionary<string, string> itemState, out HostDocument razorDocument)
-        {
-            if (itemState.TryGetValue(ItemReference.FullPathPropertyName, out var filePath))
-            {
-                // If there's no target path then we normalize the target path to the file path. In the end, all we care about
-                // is that the file being included in the primary project ends in .cshtml.
-                itemState.TryGetValue(ItemReference.LinkPropertyName, out var targetPath);
-                if (string.IsNullOrEmpty(targetPath))
-                {
-                    targetPath = filePath;
-                }
-
-                if (targetPath.EndsWith(".cshtml"))
-                {
-                    targetPath = CommonServices.UnconfiguredProject.MakeRooted(targetPath);
-                    razorDocument = new HostDocument(filePath, targetPath);
-                    return true;
-                }
-            }
-
-            razorDocument = null;
-            return false;
-        }
-
-        private static Version ReadAssemblyVersion(string filePath)
-        {
-            try
-            {
-                using (var stream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete))
-                using (var reader = new PEReader(stream))
-                {
-                    var metadataReader = reader.GetMetadataReader();
-
-                    var assemblyDefinition = metadataReader.GetAssemblyDefinition();
-                    return assemblyDefinition.Version;
-                }
-            }
-            catch
-            {
-                // We're purposely silencing any kinds of I/O exceptions here, just in case something wacky is going on.
-                return null;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/IUnconfiguredProjectCommonServices.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/IUnconfiguredProjectCommonServices.cs
deleted file mode 100644
index f520a6e0461b..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/IUnconfiguredProjectCommonServices.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.VisualStudio.ProjectSystem;
-using Microsoft.VisualStudio.ProjectSystem.References;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    // This defines the set of services that we frequently need for working with UnconfiguredProject.
-    //
-    // We're following a somewhat common pattern for code that uses CPS. It's really easy to end up
-    // relying on service location inside CPS, which can be hard to test. This approach makes it easy
-    // for us to build reusable mocks instead.
-    internal interface IUnconfiguredProjectCommonServices
-    {
-        ConfiguredProject ActiveConfiguredProject { get; }
-
-        IAssemblyReferencesService ActiveConfiguredProjectAssemblyReferences { get; }
-
-        IPackageReferencesService ActiveConfiguredProjectPackageReferences { get; }
-
-        Rules.RazorProjectProperties ActiveConfiguredProjectRazorProperties { get; }
-
-        IActiveConfiguredProjectSubscriptionService ActiveConfiguredProjectSubscription { get; }
-
-        IProjectAsynchronousTasksService TasksService { get; }
-
-        IProjectThreadingService ThreadingService { get; }
-        
-        UnconfiguredProject UnconfiguredProject { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/ManagedProjectSystemSchema.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/ManagedProjectSystemSchema.cs
deleted file mode 100644
index a56464e495b3..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/ManagedProjectSystemSchema.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    // Well-Known Schema and property names defined by the ManagedProjectSystem
-    internal static class ManagedProjectSystemSchema
-    {
-        public static class ResolvedCompilationReference
-        {
-            public static readonly string SchemaName = "ResolvedCompilationReference";
-
-            public static readonly string ItemName = "ResolvedCompilationReference";
-        }
-
-        public static class ContentItem
-        {
-            public static readonly string SchemaName = "Content";
-
-            public static readonly string ItemName = "Content";
-        }
-
-        public static class NoneItem
-        {
-            public static readonly string SchemaName = "None";
-
-            public static readonly string ItemName = "None";
-        }
-
-        public static class ItemReference
-        {
-            public static readonly string FullPathPropertyName = "FullPath";
-
-            public static readonly string LinkPropertyName = "Link";
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/RazorProjectHostBase.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/RazorProjectHostBase.cs
deleted file mode 100644
index e39a866f0540..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/RazorProjectHostBase.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.VisualStudio.LanguageServices;
-using Microsoft.VisualStudio.ProjectSystem;
-using Microsoft.VisualStudio.Threading;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal abstract class RazorProjectHostBase : OnceInitializedOnceDisposedAsync, IProjectDynamicLoadComponent
-    {
-        private readonly Workspace _workspace;
-        private readonly AsyncSemaphore _lock;
-
-        private ProjectSnapshotManagerBase _projectManager;
-        private HostProject _current;
-        private Dictionary<string, HostDocument> _currentDocuments;
-
-        public RazorProjectHostBase(
-            IUnconfiguredProjectCommonServices commonServices,
-            [Import(typeof(VisualStudioWorkspace))] Workspace workspace)
-            : base(commonServices.ThreadingService.JoinableTaskContext)
-        {
-            if (commonServices == null)
-            {
-                throw new ArgumentNullException(nameof(commonServices));
-            }
-
-            if (workspace == null)
-            {
-                throw new ArgumentNullException(nameof(workspace));
-            }
-
-            CommonServices = commonServices;
-            _workspace = workspace;
-
-            _lock = new AsyncSemaphore(initialCount: 1);
-            _currentDocuments = new Dictionary<string, HostDocument>(FilePathComparer.Instance);
-        }
-
-        // Internal for testing
-        protected RazorProjectHostBase(
-            IUnconfiguredProjectCommonServices commonServices,
-             Workspace workspace,
-             ProjectSnapshotManagerBase projectManager)
-            : base(commonServices.ThreadingService.JoinableTaskContext)
-        {
-            if (commonServices == null)
-            {
-                throw new ArgumentNullException(nameof(commonServices));
-            }
-
-            if (workspace == null)
-            {
-                throw new ArgumentNullException(nameof(workspace));
-            }
-
-            if (projectManager == null)
-            {
-                throw new ArgumentNullException(nameof(projectManager));
-            }
-
-            CommonServices = commonServices;
-            _workspace = workspace;
-            _projectManager = projectManager;
-
-            _lock = new AsyncSemaphore(initialCount: 1);
-            _currentDocuments = new Dictionary<string, HostDocument>(FilePathComparer.Instance);
-        }
-
-        protected HostProject Current => _current;
-
-        protected IUnconfiguredProjectCommonServices CommonServices { get; }
-
-        // internal for tests. The product will call through the IProjectDynamicLoadComponent interface.
-        internal Task LoadAsync()
-        {
-            return InitializeAsync();
-        }
-
-        protected override Task InitializeCoreAsync(CancellationToken cancellationToken)
-        {
-            CommonServices.UnconfiguredProject.ProjectRenaming += UnconfiguredProject_ProjectRenaming;
-
-            return Task.CompletedTask;
-        }
-
-        protected override async Task DisposeCoreAsync(bool initialized)
-        {
-            if (initialized)
-            {
-                CommonServices.UnconfiguredProject.ProjectRenaming -= UnconfiguredProject_ProjectRenaming;
-
-                await ExecuteWithLock(async () =>
-                {
-                    if (_current != null)
-                    {
-                        await UpdateAsync(UninitializeProjectUnsafe).ConfigureAwait(false);
-                    }
-                });
-            }
-        }
-
-        // Internal for tests
-        internal async Task OnProjectRenamingAsync()
-        {
-            // When a project gets renamed we expect any rules watched by the derived class to fire.
-            //
-            // However, the project snapshot manager uses the project Fullpath as the key. We want to just
-            // reinitialize the HostProject with the same configuration and settings here, but the updated
-            // FilePath.
-            await ExecuteWithLock(async () =>
-            {
-                if (_current != null)
-                {
-                    var old = _current;
-                    var oldDocuments = _currentDocuments.Values.ToArray();
-
-                    await UpdateAsync(UninitializeProjectUnsafe).ConfigureAwait(false);
-
-                    await UpdateAsync(() =>
-                    {
-                        var filePath = CommonServices.UnconfiguredProject.FullPath;
-                        UpdateProjectUnsafe(new HostProject(filePath, old.Configuration));
-
-                        // This should no-op in the common case, just putting it here for insurance.
-                        for (var i = 0; i < oldDocuments.Length; i++)
-                        {
-                            AddDocumentUnsafe(oldDocuments[i]);
-                        }
-                    }).ConfigureAwait(false);
-                }
-            });
-        }
-
-        // Should only be called from the UI thread.
-        private ProjectSnapshotManagerBase GetProjectManager()
-        {
-            CommonServices.ThreadingService.VerifyOnUIThread();
-
-            if (_projectManager == null)
-            {
-                _projectManager = (ProjectSnapshotManagerBase)_workspace.Services.GetLanguageServices(RazorLanguage.Name).GetRequiredService<ProjectSnapshotManager>();
-            }
-
-            return _projectManager;
-        }
-
-        protected async Task UpdateAsync(Action action)
-        {
-            await CommonServices.ThreadingService.SwitchToUIThread();
-            action();
-        }
-
-        protected void UninitializeProjectUnsafe()
-        {
-            ClearDocumentsUnsafe();
-            UpdateProjectUnsafe(null);
-        }
-
-        protected void UpdateProjectUnsafe(HostProject project)
-        {
-            var projectManager = GetProjectManager();
-            if (_current == null && project == null)
-            {
-                // This is a no-op. This project isn't using Razor.
-            }
-            else if (_current == null && project != null)
-            {
-                projectManager.HostProjectAdded(project);
-            }
-            else if (_current != null && project == null)
-            {
-                Debug.Assert(_currentDocuments.Count == 0);
-                projectManager.HostProjectRemoved(_current);
-            }
-            else
-            {
-                projectManager.HostProjectChanged(project);
-            }
-
-            _current = project;
-        }
-
-        protected void AddDocumentUnsafe(HostDocument document)
-        {
-            var projectManager = GetProjectManager();
-
-            if (_currentDocuments.ContainsKey(document.FilePath))
-            {
-                // Ignore duplicates
-                return;
-            }
-
-            projectManager.DocumentAdded(_current, document, new FileTextLoader(document.FilePath, null));
-            _currentDocuments.Add(document.FilePath, document);
-        }
-
-        protected void RemoveDocumentUnsafe(HostDocument document)
-        {
-            var projectManager = GetProjectManager();
-
-            projectManager.DocumentRemoved(_current, document);
-            _currentDocuments.Remove(document.FilePath);
-        }
-
-        protected void ClearDocumentsUnsafe()
-        {
-            var projectManager = GetProjectManager();
-
-            foreach (var kvp in _currentDocuments)
-            {
-                _projectManager.DocumentRemoved(_current, kvp.Value);
-            }
-
-            _currentDocuments.Clear();
-        }
-        
-        protected async Task ExecuteWithLock(Func<Task> func)
-        {
-            using (JoinableCollection.Join())
-            {
-                using (await _lock.EnterAsync().ConfigureAwait(false))
-                {
-                    var task = JoinableFactory.RunAsync(func);
-                    await task.Task.ConfigureAwait(false);
-                }
-            }
-        }
-
-        Task IProjectDynamicLoadComponent.LoadAsync()
-        {
-            return InitializeAsync();
-        }
-
-        Task IProjectDynamicLoadComponent.UnloadAsync()
-        {
-            return DisposeAsync();
-        }
-
-        private async Task UnconfiguredProject_ProjectRenaming(object sender, ProjectRenamedEventArgs args)
-        {
-            await OnProjectRenamingAsync().ConfigureAwait(false);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorConfiguration.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorConfiguration.cs
deleted file mode 100644
index d8c2484f5ba4..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorConfiguration.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
-	
-	
-	internal partial class RazorConfiguration {
-		
-		/// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
-		private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
-		
-		/// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
-		internal const string SchemaName = "RazorConfiguration";
-		
-		/// <summary>The ItemType given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceItemType = "RazorConfiguration";
-		
-		/// <summary>The Label given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceLabel = "";
-		
-		/// <summary>Razor Extensions (The "Extensions" property).</summary>
-		internal const string ExtensionsProperty = "Extensions";
-		
-		/// <summary>Backing field for the <see cref='Microsoft.Build.Framework.XamlTypes.Rule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
-		
-		/// <summary>Backing field for the file name of the rule property.</summary>
-		private string file;
-		
-		/// <summary>Backing field for the ItemType property.</summary>
-		private string itemType;
-		
-		/// <summary>Backing field for the ItemName property.</summary>
-		private string itemName;
-		
-		/// <summary>Configured Project</summary>
-		private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
-		
-		/// <summary>The dictionary of named catalogs.</summary>
-		private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
-		
-		/// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
-		
-		/// <summary>Thread locking object</summary>
-		private object locker = new object();
-		
-		/// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
-		internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule) {
-			this.rule = rule;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
-		internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : 
-				this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName)) {
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.catalogs = catalogs;
-			this.file = file;
-			this.itemType = itemType;
-			this.itemName = itemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
-		internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : 
-				this(rule) {
-			if ((rule == null)) {
-				throw new System.ArgumentNullException("rule");
-			}
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.rule = rule;
-			this.file = this.rule.File;
-			this.itemType = this.rule.ItemType;
-			this.itemName = this.rule.ItemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
-		internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : 
-				this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName) {
-		}
-		
-		/// <summary>Initializes a new instance of the RazorConfiguration class that assumes a project context (neither property sheet nor items).</summary>
-		internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : 
-				this(configuredProject, catalogs, "Project", null, null, null) {
-		}
-		
-		/// <summary>Gets the IRule used to get and set properties.</summary>
-		public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule {
-			get {
-				return this.rule;
-			}
-		}
-		
-		/// <summary>Razor Extensions</summary>
-		internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty Extensions {
-			get {
-				Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
-				if ((localRule == null)) {
-					localRule = this.GeneratedFallbackRule;
-				}
-				if ((localRule == null)) {
-					return null;
-				}
-				Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(ExtensionsProperty)));
-				if (((property == null) 
-							&& (this.GeneratedFallbackRule != null))) {
-					localRule = this.GeneratedFallbackRule;
-					property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(ExtensionsProperty)));
-				}
-				return property;
-			}
-		}
-		
-		/// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule {
-			get {
-				if (((this.fallbackRule == null) 
-							&& (this.configuredProject != null))) {
-					System.Threading.Monitor.Enter(this.locker);
-					try {
-						if ((this.fallbackRule == null)) {
-							this.InitializeFallbackRule();
-						}
-					}
-					finally {
-						System.Threading.Monitor.Exit(this.locker);
-					}
-				}
-				return this.fallbackRule;
-			}
-		}
-		
-		private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName) {
-			if ((catalog == null)) {
-				return null;
-			}
-			return catalog.BindToContext(SchemaName, file, itemType, itemName);
-		}
-		
-		private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext) {
-			if ((propertiesContext.IsProjectFile == true)) {
-				return null;
-			}
-			else {
-				return propertiesContext.File;
-			}
-		}
-		
-		private void InitializeFallbackRule() {
-			if ((this.configuredProject == null)) {
-				return;
-			}
-			Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorConfiguration.deserializedFallbackRule;
-			if ((unboundRule == null)) {
-				System.IO.Stream xamlStream = null;
-				System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
-				try {
-					xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorConfiguration.xaml");
-					Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
-					System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
-					for (
-					; ((unboundRule == null) 
-								&& ruleEnumerator.MoveNext()); 
-					) {
-						Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
-						if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) {
-							unboundRule = t;
-							unboundRule.Name = "30e71838-2cb8-4c67-ab28-7670763124af";
-							RazorConfiguration.deserializedFallbackRule = unboundRule;
-						}
-					}
-				}
-				finally {
-					if ((xamlStream != null)) {
-						((System.IDisposable)(xamlStream)).Dispose();
-					}
-				}
-			}
-			this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
-			Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
-			this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
-		}
-	}
-	
-	internal partial class RazorProjectProperties {
-		
-		private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorConfiguration> CreateRazorConfigurationPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorConfiguration>(CreateRazorConfigurationProperties);
-		
-		private static RazorConfiguration CreateRazorConfigurationProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state) {
-			RazorProjectProperties that = ((RazorProjectProperties)(state));
-			return new RazorConfiguration(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
-		}
-		
-		/// <summary>Gets the strongly-typed property accessor used to get and set Configuration Properties properties.</summary>
-		internal System.Threading.Tasks.Task<RazorConfiguration> GetRazorConfigurationPropertiesAsync() {
-			System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
-			return namedCatalogsTask.ContinueWith(CreateRazorConfigurationPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
-		}
-	}
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorExtension.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorExtension.cs
deleted file mode 100644
index 0ce503811bc6..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorExtension.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
-	
-	
-	internal partial class RazorExtension {
-		
-		/// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
-		private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
-		
-		/// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
-		internal const string SchemaName = "RazorExtension";
-		
-		/// <summary>The ItemType given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceItemType = "RazorExtension";
-		
-		/// <summary>The Label given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceLabel = "";
-		
-		/// <summary>Razor Extension Assembly Name (The "AssemblyName" property).</summary>
-		internal const string AssemblyNameProperty = "AssemblyName";
-		
-		/// <summary>Razor Extension Assembly File Path (The "AssemblyFilePath" property).</summary>
-		internal const string AssemblyFilePathProperty = "AssemblyFilePath";
-		
-		/// <summary>Backing field for the <see cref='Microsoft.Build.Framework.XamlTypes.Rule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
-		
-		/// <summary>Backing field for the file name of the rule property.</summary>
-		private string file;
-		
-		/// <summary>Backing field for the ItemType property.</summary>
-		private string itemType;
-		
-		/// <summary>Backing field for the ItemName property.</summary>
-		private string itemName;
-		
-		/// <summary>Configured Project</summary>
-		private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
-		
-		/// <summary>The dictionary of named catalogs.</summary>
-		private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
-		
-		/// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
-		
-		/// <summary>Thread locking object</summary>
-		private object locker = new object();
-		
-		/// <summary>Initializes a new instance of the RazorExtension class.</summary>
-		internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule) {
-			this.rule = rule;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorExtension class.</summary>
-		internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : 
-				this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName)) {
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.catalogs = catalogs;
-			this.file = file;
-			this.itemType = itemType;
-			this.itemName = itemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorExtension class.</summary>
-		internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : 
-				this(rule) {
-			if ((rule == null)) {
-				throw new System.ArgumentNullException("rule");
-			}
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.rule = rule;
-			this.file = this.rule.File;
-			this.itemType = this.rule.ItemType;
-			this.itemName = this.rule.ItemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorExtension class.</summary>
-		internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : 
-				this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName) {
-		}
-		
-		/// <summary>Initializes a new instance of the RazorExtension class that assumes a project context (neither property sheet nor items).</summary>
-		internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : 
-				this(configuredProject, catalogs, "Project", null, null, null) {
-		}
-		
-		/// <summary>Gets the IRule used to get and set properties.</summary>
-		public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule {
-			get {
-				return this.rule;
-			}
-		}
-		
-		/// <summary>Razor Extension Assembly Name</summary>
-		internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty AssemblyName {
-			get {
-				Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
-				if ((localRule == null)) {
-					localRule = this.GeneratedFallbackRule;
-				}
-				if ((localRule == null)) {
-					return null;
-				}
-				Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyNameProperty)));
-				if (((property == null) 
-							&& (this.GeneratedFallbackRule != null))) {
-					localRule = this.GeneratedFallbackRule;
-					property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyNameProperty)));
-				}
-				return property;
-			}
-		}
-		
-		/// <summary>Razor Extension Assembly File Path</summary>
-		internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty AssemblyFilePath {
-			get {
-				Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
-				if ((localRule == null)) {
-					localRule = this.GeneratedFallbackRule;
-				}
-				if ((localRule == null)) {
-					return null;
-				}
-				Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyFilePathProperty)));
-				if (((property == null) 
-							&& (this.GeneratedFallbackRule != null))) {
-					localRule = this.GeneratedFallbackRule;
-					property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyFilePathProperty)));
-				}
-				return property;
-			}
-		}
-		
-		/// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule {
-			get {
-				if (((this.fallbackRule == null) 
-							&& (this.configuredProject != null))) {
-					System.Threading.Monitor.Enter(this.locker);
-					try {
-						if ((this.fallbackRule == null)) {
-							this.InitializeFallbackRule();
-						}
-					}
-					finally {
-						System.Threading.Monitor.Exit(this.locker);
-					}
-				}
-				return this.fallbackRule;
-			}
-		}
-		
-		private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName) {
-			if ((catalog == null)) {
-				return null;
-			}
-			return catalog.BindToContext(SchemaName, file, itemType, itemName);
-		}
-		
-		private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext) {
-			if ((propertiesContext.IsProjectFile == true)) {
-				return null;
-			}
-			else {
-				return propertiesContext.File;
-			}
-		}
-		
-		private void InitializeFallbackRule() {
-			if ((this.configuredProject == null)) {
-				return;
-			}
-			Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorExtension.deserializedFallbackRule;
-			if ((unboundRule == null)) {
-				System.IO.Stream xamlStream = null;
-				System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
-				try {
-					xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorExtension.xaml");
-					Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
-					System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
-					for (
-					; ((unboundRule == null) 
-								&& ruleEnumerator.MoveNext()); 
-					) {
-						Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
-						if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) {
-							unboundRule = t;
-							unboundRule.Name = "6b577687-703b-41a1-8f5f-c44644f65f2a";
-							RazorExtension.deserializedFallbackRule = unboundRule;
-						}
-					}
-				}
-				finally {
-					if ((xamlStream != null)) {
-						((System.IDisposable)(xamlStream)).Dispose();
-					}
-				}
-			}
-			this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
-			Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
-			this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
-		}
-	}
-	
-	internal partial class RazorProjectProperties {
-		
-		private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorExtension> CreateRazorExtensionPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorExtension>(CreateRazorExtensionProperties);
-		
-		private static RazorExtension CreateRazorExtensionProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state) {
-			RazorProjectProperties that = ((RazorProjectProperties)(state));
-			return new RazorExtension(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
-		}
-		
-		/// <summary>Gets the strongly-typed property accessor used to get and set Extension Properties properties.</summary>
-		internal System.Threading.Tasks.Task<RazorExtension> GetRazorExtensionPropertiesAsync() {
-			System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
-			return namedCatalogsTask.ContinueWith(CreateRazorExtensionPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
-		}
-	}
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGeneral.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGeneral.cs
deleted file mode 100644
index 860fb1a80b66..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGeneral.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
-	
-	
-	internal partial class RazorGeneral {
-		
-		/// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
-		private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
-		
-		/// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
-		internal const string SchemaName = "RazorGeneral";
-		
-		/// <summary>The ItemType given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceItemType = null;
-		
-		/// <summary>The Label given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceLabel = "";
-		
-		/// <summary>Razor Language Version (The "RazorLangVersion" property).</summary>
-		internal const string RazorLangVersionProperty = "RazorLangVersion";
-		
-		/// <summary>Razor Configuration Name (The "RazorDefaultConfiguration" property).</summary>
-		internal const string RazorDefaultConfigurationProperty = "RazorDefaultConfiguration";
-		
-		/// <summary>Backing field for the <see cref='Microsoft.Build.Framework.XamlTypes.Rule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
-		
-		/// <summary>Backing field for the file name of the rule property.</summary>
-		private string file;
-		
-		/// <summary>Backing field for the ItemType property.</summary>
-		private string itemType;
-		
-		/// <summary>Backing field for the ItemName property.</summary>
-		private string itemName;
-		
-		/// <summary>Configured Project</summary>
-		private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
-		
-		/// <summary>The dictionary of named catalogs.</summary>
-		private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
-		
-		/// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
-		
-		/// <summary>Thread locking object</summary>
-		private object locker = new object();
-		
-		/// <summary>Initializes a new instance of the RazorGeneral class.</summary>
-		internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule) {
-			this.rule = rule;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGeneral class.</summary>
-		internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : 
-				this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName)) {
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.catalogs = catalogs;
-			this.file = file;
-			this.itemType = itemType;
-			this.itemName = itemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGeneral class.</summary>
-		internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : 
-				this(rule) {
-			if ((rule == null)) {
-				throw new System.ArgumentNullException("rule");
-			}
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.rule = rule;
-			this.file = this.rule.File;
-			this.itemType = this.rule.ItemType;
-			this.itemName = this.rule.ItemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGeneral class.</summary>
-		internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : 
-				this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName) {
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGeneral class that assumes a project context (neither property sheet nor items).</summary>
-		internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : 
-				this(configuredProject, catalogs, "Project", null, null, null) {
-		}
-		
-		/// <summary>Gets the IRule used to get and set properties.</summary>
-		public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule {
-			get {
-				return this.rule;
-			}
-		}
-		
-		/// <summary>Razor Language Version</summary>
-		internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty RazorLangVersion {
-			get {
-				Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
-				if ((localRule == null)) {
-					localRule = this.GeneratedFallbackRule;
-				}
-				if ((localRule == null)) {
-					return null;
-				}
-				Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorLangVersionProperty)));
-				if (((property == null) 
-							&& (this.GeneratedFallbackRule != null))) {
-					localRule = this.GeneratedFallbackRule;
-					property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorLangVersionProperty)));
-				}
-				return property;
-			}
-		}
-		
-		/// <summary>Razor Configuration Name</summary>
-		internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty RazorDefaultConfiguration {
-			get {
-				Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
-				if ((localRule == null)) {
-					localRule = this.GeneratedFallbackRule;
-				}
-				if ((localRule == null)) {
-					return null;
-				}
-				Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorDefaultConfigurationProperty)));
-				if (((property == null) 
-							&& (this.GeneratedFallbackRule != null))) {
-					localRule = this.GeneratedFallbackRule;
-					property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorDefaultConfigurationProperty)));
-				}
-				return property;
-			}
-		}
-		
-		/// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule {
-			get {
-				if (((this.fallbackRule == null) 
-							&& (this.configuredProject != null))) {
-					System.Threading.Monitor.Enter(this.locker);
-					try {
-						if ((this.fallbackRule == null)) {
-							this.InitializeFallbackRule();
-						}
-					}
-					finally {
-						System.Threading.Monitor.Exit(this.locker);
-					}
-				}
-				return this.fallbackRule;
-			}
-		}
-		
-		private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName) {
-			if ((catalog == null)) {
-				return null;
-			}
-			return catalog.BindToContext(SchemaName, file, itemType, itemName);
-		}
-		
-		private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext) {
-			if ((propertiesContext.IsProjectFile == true)) {
-				return null;
-			}
-			else {
-				return propertiesContext.File;
-			}
-		}
-		
-		private void InitializeFallbackRule() {
-			if ((this.configuredProject == null)) {
-				return;
-			}
-			Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorGeneral.deserializedFallbackRule;
-			if ((unboundRule == null)) {
-				System.IO.Stream xamlStream = null;
-				System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
-				try {
-					xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorGeneral.xaml");
-					Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
-					System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
-					for (
-					; ((unboundRule == null) 
-								&& ruleEnumerator.MoveNext()); 
-					) {
-						Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
-						if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) {
-							unboundRule = t;
-							unboundRule.Name = "e0400917-b7e9-4731-b3e6-447b229db9d4";
-							RazorGeneral.deserializedFallbackRule = unboundRule;
-						}
-					}
-				}
-				finally {
-					if ((xamlStream != null)) {
-						((System.IDisposable)(xamlStream)).Dispose();
-					}
-				}
-			}
-			this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
-			Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
-			this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
-		}
-	}
-	
-	internal partial class RazorProjectProperties {
-		
-		private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGeneral> CreateRazorGeneralPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGeneral>(CreateRazorGeneralProperties);
-		
-		private static RazorGeneral CreateRazorGeneralProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state) {
-			RazorProjectProperties that = ((RazorProjectProperties)(state));
-			return new RazorGeneral(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
-		}
-		
-		/// <summary>Gets the strongly-typed property accessor used to get and set Razor Properties properties.</summary>
-		internal System.Threading.Tasks.Task<RazorGeneral> GetRazorGeneralPropertiesAsync() {
-			System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
-			return namedCatalogsTask.ContinueWith(CreateRazorGeneralPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
-		}
-	}
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGenerateWithTargetPath.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGenerateWithTargetPath.cs
deleted file mode 100644
index 8428e7244fd8..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGenerateWithTargetPath.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
-	
-	
-	internal partial class RazorGenerateWithTargetPath {
-		
-		/// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
-		private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
-		
-		/// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
-		internal const string SchemaName = "RazorGenerateWithTargetPath";
-		
-		/// <summary>The ItemType given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceItemType = "RazorGenerateWithTargetPath";
-		
-		/// <summary>The Label given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceLabel = "";
-		
-		/// <summary>Target Path (The "TargetPath" property).</summary>
-		internal const string TargetPathProperty = "TargetPath";
-		
-		/// <summary>Backing field for the <see cref='Microsoft.Build.Framework.XamlTypes.Rule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
-		
-		/// <summary>Backing field for the file name of the rule property.</summary>
-		private string file;
-		
-		/// <summary>Backing field for the ItemType property.</summary>
-		private string itemType;
-		
-		/// <summary>Backing field for the ItemName property.</summary>
-		private string itemName;
-		
-		/// <summary>Configured Project</summary>
-		private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
-		
-		/// <summary>The dictionary of named catalogs.</summary>
-		private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
-		
-		/// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
-		
-		/// <summary>Thread locking object</summary>
-		private object locker = new object();
-		
-		/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
-		internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule) {
-			this.rule = rule;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
-		internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : 
-				this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName)) {
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.catalogs = catalogs;
-			this.file = file;
-			this.itemType = itemType;
-			this.itemName = itemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
-		internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : 
-				this(rule) {
-			if ((rule == null)) {
-				throw new System.ArgumentNullException("rule");
-			}
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.rule = rule;
-			this.file = this.rule.File;
-			this.itemType = this.rule.ItemType;
-			this.itemName = this.rule.ItemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
-		internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : 
-				this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName) {
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class that assumes a project context (neither property sheet nor items).</summary>
-		internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : 
-				this(configuredProject, catalogs, "Project", null, null, null) {
-		}
-		
-		/// <summary>Gets the IRule used to get and set properties.</summary>
-		public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule {
-			get {
-				return this.rule;
-			}
-		}
-		
-		/// <summary>Target Path</summary>
-		internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty TargetPath {
-			get {
-				Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
-				if ((localRule == null)) {
-					localRule = this.GeneratedFallbackRule;
-				}
-				if ((localRule == null)) {
-					return null;
-				}
-				Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(TargetPathProperty)));
-				if (((property == null) 
-							&& (this.GeneratedFallbackRule != null))) {
-					localRule = this.GeneratedFallbackRule;
-					property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(TargetPathProperty)));
-				}
-				return property;
-			}
-		}
-		
-		/// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule {
-			get {
-				if (((this.fallbackRule == null) 
-							&& (this.configuredProject != null))) {
-					System.Threading.Monitor.Enter(this.locker);
-					try {
-						if ((this.fallbackRule == null)) {
-							this.InitializeFallbackRule();
-						}
-					}
-					finally {
-						System.Threading.Monitor.Exit(this.locker);
-					}
-				}
-				return this.fallbackRule;
-			}
-		}
-		
-		private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName) {
-			if ((catalog == null)) {
-				return null;
-			}
-			return catalog.BindToContext(SchemaName, file, itemType, itemName);
-		}
-		
-		private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext) {
-			if ((propertiesContext.IsProjectFile == true)) {
-				return null;
-			}
-			else {
-				return propertiesContext.File;
-			}
-		}
-		
-		private void InitializeFallbackRule() {
-			if ((this.configuredProject == null)) {
-				return;
-			}
-			Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorGenerateWithTargetPath.deserializedFallbackRule;
-			if ((unboundRule == null)) {
-				System.IO.Stream xamlStream = null;
-				System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
-				try {
-					xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorGenerateWithTargetPath.xaml");
-					Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
-					System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
-					for (
-					; ((unboundRule == null) 
-								&& ruleEnumerator.MoveNext()); 
-					) {
-						Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
-						if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) {
-							unboundRule = t;
-							unboundRule.Name = "4d01f23e-96db-4c90-9c01-17b7f8b61243";
-							RazorGenerateWithTargetPath.deserializedFallbackRule = unboundRule;
-						}
-					}
-				}
-				finally {
-					if ((xamlStream != null)) {
-						((System.IDisposable)(xamlStream)).Dispose();
-					}
-				}
-			}
-			this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
-			Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
-			this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
-		}
-	}
-	
-	internal partial class RazorProjectProperties {
-		
-		private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGenerateWithTargetPath> CreateRazorGenerateWithTargetPathPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGenerateWithTargetPath>(CreateRazorGenerateWithTargetPathProperties);
-		
-		private static RazorGenerateWithTargetPath CreateRazorGenerateWithTargetPathProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state) {
-			RazorProjectProperties that = ((RazorProjectProperties)(state));
-			return new RazorGenerateWithTargetPath(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
-		}
-		
-		/// <summary>Gets the strongly-typed property accessor used to get and set Razor Document Properties properties.</summary>
-		internal System.Threading.Tasks.Task<RazorGenerateWithTargetPath> GetRazorGenerateWithTargetPathPropertiesAsync() {
-			System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
-			return namedCatalogsTask.ContinueWith(CreateRazorGenerateWithTargetPathPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
-		}
-	}
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorProjectProperties.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorProjectProperties.cs
deleted file mode 100644
index cc8f28a6f124..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorProjectProperties.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.ComponentModel.Composition;
-using Microsoft.VisualStudio.ProjectSystem;
-using Microsoft.VisualStudio.ProjectSystem.Properties;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules
-{
-    [Export]
-    internal partial class RazorProjectProperties : StronglyTypedPropertyAccess
-    {
-        [ImportingConstructor]
-        public RazorProjectProperties(ConfiguredProject configuredProject) 
-            : base(configuredProject)
-        {
-        }
-
-        public RazorProjectProperties(ConfiguredProject configuredProject, UnconfiguredProject unconfiguredProject)
-            : base(configuredProject, unconfiguredProject)
-        {
-        }
-
-        public RazorProjectProperties(ConfiguredProject configuredProject, IProjectPropertiesContext projectPropertiesContext) 
-            : base(configuredProject, projectPropertiesContext)
-        {
-        }
-
-        public RazorProjectProperties(ConfiguredProject configuredProject, string file, string itemType, string itemName) 
-            : base(configuredProject, file, itemType, itemName)
-        {
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/UnconfiguredProjectCommonServices.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/UnconfiguredProjectCommonServices.cs
deleted file mode 100644
index d84595a1c389..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/UnconfiguredProjectCommonServices.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.ComponentModel.Composition;
-using Microsoft.VisualStudio.ProjectSystem;
-using Microsoft.VisualStudio.ProjectSystem.References;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    [Export(typeof(IUnconfiguredProjectCommonServices))]
-    internal class UnconfiguredProjectCommonServices : IUnconfiguredProjectCommonServices
-    {
-        private readonly ActiveConfiguredProject<ConfiguredProject> _activeConfiguredProject;
-        private readonly ActiveConfiguredProject<IAssemblyReferencesService> _activeConfiguredProjectAssemblyReferences;
-        private readonly ActiveConfiguredProject<IPackageReferencesService> _activeConfiguredProjectPackageReferences;
-        private readonly ActiveConfiguredProject<Rules.RazorProjectProperties> _activeConfiguredProjectProperties;
-
-        [ImportingConstructor]
-        public UnconfiguredProjectCommonServices(
-            [Import(ExportContractNames.Scopes.UnconfiguredProject)] IProjectAsynchronousTasksService tasksService,
-            IProjectThreadingService threadingService,
-            UnconfiguredProject unconfiguredProject,
-            IActiveConfiguredProjectSubscriptionService activeConfiguredProjectSubscription,
-            ActiveConfiguredProject<ConfiguredProject> activeConfiguredProject,
-            ActiveConfiguredProject<IAssemblyReferencesService> activeConfiguredProjectAssemblyReferences,
-            ActiveConfiguredProject<IPackageReferencesService> activeConfiguredProjectPackageReferences,
-            ActiveConfiguredProject<Rules.RazorProjectProperties> activeConfiguredProjectRazorProperties)
-        {
-            if (tasksService == null)
-            {
-                throw new ArgumentNullException(nameof(tasksService));
-            }
-
-            if (threadingService == null)
-            {
-                throw new ArgumentNullException(nameof(threadingService));
-            }
-
-            if (unconfiguredProject == null)
-            {
-                throw new ArgumentNullException(nameof(unconfiguredProject));
-            }
-
-            if (activeConfiguredProjectSubscription == null)
-            {
-                throw new ArgumentNullException(nameof(ActiveConfiguredProjectSubscription));
-            }
-
-            if (activeConfiguredProject == null)
-            {
-                throw new ArgumentNullException(nameof(activeConfiguredProject));
-            }
-
-            if (activeConfiguredProjectAssemblyReferences == null)
-            {
-                throw new ArgumentNullException(nameof(activeConfiguredProjectAssemblyReferences));
-            }
-
-            if (activeConfiguredProjectPackageReferences == null)
-            {
-                throw new ArgumentNullException(nameof(activeConfiguredProjectPackageReferences));
-            }
-
-            if (activeConfiguredProjectRazorProperties == null)
-            {
-                throw new ArgumentNullException(nameof(activeConfiguredProjectRazorProperties));
-            }
-
-            TasksService = tasksService;
-            ThreadingService = threadingService;
-            UnconfiguredProject = unconfiguredProject;
-            ActiveConfiguredProjectSubscription = activeConfiguredProjectSubscription;
-            _activeConfiguredProject = activeConfiguredProject;
-            _activeConfiguredProjectAssemblyReferences = activeConfiguredProjectAssemblyReferences;
-            _activeConfiguredProjectPackageReferences = activeConfiguredProjectPackageReferences;
-            _activeConfiguredProjectProperties = activeConfiguredProjectRazorProperties;
-        }
-
-        public ConfiguredProject ActiveConfiguredProject => _activeConfiguredProject.Value;
-
-        public IAssemblyReferencesService ActiveConfiguredProjectAssemblyReferences => _activeConfiguredProjectAssemblyReferences.Value;
-
-        public IPackageReferencesService ActiveConfiguredProjectPackageReferences => _activeConfiguredProjectPackageReferences.Value;
-
-        public Rules.RazorProjectProperties ActiveConfiguredProjectRazorProperties => _activeConfiguredProjectProperties.Value;
-        
-        public IActiveConfiguredProjectSubscriptionService ActiveConfiguredProjectSubscription { get; }
-
-        public IProjectAsynchronousTasksService TasksService { get; }
-
-        public IProjectThreadingService ThreadingService { get; }
-
-        public UnconfiguredProject UnconfiguredProject { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Properties/AssemblyInfo.cs
deleted file mode 100644
index a827ebd2da2e..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.RazorExtension, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Properties/Resources.Designer.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Properties/Resources.Designer.cs
deleted file mode 100644
index 2237686c5467..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// <auto-generated />
-namespace Microsoft.VisualStudio.LanguageServices.Razor
-{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class Resources
-    {
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.VisualStudio.LanguageServices.Razor.Resources", typeof(Resources).GetTypeInfo().Assembly);
-
-        /// <summary>
-        /// Value cannot be null or an empty string.
-        /// </summary>
-        internal static string ArgumentCannotBeNullOrEmpty
-        {
-            get => GetString("ArgumentCannotBeNullOrEmpty");
-        }
-
-        /// <summary>
-        /// Value cannot be null or an empty string.
-        /// </summary>
-        internal static string FormatArgumentCannotBeNullOrEmpty()
-            => GetString("ArgumentCannotBeNullOrEmpty");
-
-        /// <summary>
-        /// An unexpected exception occurred when invoking '{0}.{1}' on the Razor language service.
-        /// </summary>
-        internal static string UnexpectedException
-        {
-            get => GetString("UnexpectedException");
-        }
-
-        /// <summary>
-        /// An unexpected exception occurred when invoking '{0}.{1}' on the Razor language service.
-        /// </summary>
-        internal static string FormatUnexpectedException(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("UnexpectedException"), p0, p1);
-
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
-                }
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Resources.resx b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Resources.resx
deleted file mode 100644
index 87f559339f30..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Resources.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
-    <value>Value cannot be null or an empty string.</value>
-  </data>
-  <data name="UnexpectedException" xml:space="preserve">
-    <value>An unexpected exception occurred when invoking '{0}.{1}' on the Razor language service.</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/JsonConverterCollectionExtensions.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/JsonConverterCollectionExtensions.cs
deleted file mode 100644
index 1f008fd63d81..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/JsonConverterCollectionExtensions.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.VisualStudio.LanguageServices.Razor.Serialization;
-using Newtonsoft.Json;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    internal static class JsonConverterCollectionExtensions
-    {
-        public static void RegisterRazorConverters(this JsonConverterCollection collection)
-        {
-            if (collection == null)
-            {
-                throw new ArgumentNullException(nameof(collection));
-            }
-
-            collection.Add(TagHelperDescriptorJsonConverter.Instance);
-            collection.Add(RazorDiagnosticJsonConverter.Instance);
-            collection.Add(RazorExtensionJsonConverter.Instance);
-            collection.Add(RazorConfigurationJsonConverter.Instance);
-            collection.Add(ProjectSnapshotJsonConverter.Instance);
-            collection.Add(ProjectSnapshotHandleJsonConverter.Instance);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/ProjectSnapshotHandle.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/ProjectSnapshotHandle.cs
deleted file mode 100644
index d186db2ec829..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/ProjectSnapshotHandle.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal sealed class ProjectSnapshotHandle
-    {
-        public ProjectSnapshotHandle(string filePath, RazorConfiguration configuration, ProjectId workspaceProjectId)
-        {
-            if (filePath == null)
-            {
-                throw new ArgumentNullException(nameof(filePath));
-            }
-
-            FilePath = filePath;
-            Configuration = configuration;
-            WorkspaceProjectId = workspaceProjectId;
-        }
-
-        public RazorConfiguration Configuration { get; }
-
-        public string FilePath { get; }
-
-        public ProjectId WorkspaceProjectId { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/ProjectSnapshotHandleJsonConverter.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/ProjectSnapshotHandleJsonConverter.cs
deleted file mode 100644
index 5b72763912a0..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/ProjectSnapshotHandleJsonConverter.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor.Serialization
-{
-    internal class ProjectSnapshotHandleJsonConverter : JsonConverter
-    {
-        public static readonly ProjectSnapshotHandleJsonConverter Instance = new ProjectSnapshotHandleJsonConverter();
-
-        public override bool CanConvert(Type objectType)
-        {
-            return typeof(ProjectSnapshotHandle).IsAssignableFrom(objectType);
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            if (reader.TokenType != JsonToken.StartObject)
-            {
-                return null;
-            }
-
-            var obj = JObject.Load(reader);
-            var filePath = obj[nameof(ProjectSnapshotHandle.FilePath)].Value<string>();
-            var configuration = obj[nameof(ProjectSnapshotHandle.Configuration)].ToObject<RazorConfiguration>(serializer);
-            
-            var id = obj[nameof(ProjectSnapshotHandle.WorkspaceProjectId)].Value<string>();
-            var workspaceProjectId = id == null ? null : ProjectId.CreateFromSerialized(Guid.Parse(id));
-
-            return new ProjectSnapshotHandle(filePath, configuration, workspaceProjectId);
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var handle = (ProjectSnapshotHandle)value;
-
-            writer.WriteStartObject();
-
-            writer.WritePropertyName(nameof(ProjectSnapshotHandle.FilePath));
-            writer.WriteValue(handle.FilePath);
-
-            if (handle.Configuration == null)
-            {
-                writer.WritePropertyName(nameof(ProjectSnapshotHandle.Configuration));
-                writer.WriteNull();
-            }
-            else
-            {
-                writer.WritePropertyName(nameof(ProjectSnapshotHandle.Configuration));
-                serializer.Serialize(writer, handle.Configuration);
-            }
-
-            if (handle.WorkspaceProjectId == null)
-            {
-                writer.WritePropertyName(nameof(ProjectSnapshotHandle.WorkspaceProjectId));
-                writer.WriteNull();
-            }
-            else
-            {
-                writer.WritePropertyName(nameof(ProjectSnapshotHandle.WorkspaceProjectId));
-                writer.WriteValue(handle.WorkspaceProjectId.Id);
-            }
-
-            writer.WriteEndObject();
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/ProjectSnapshotJsonConverter.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/ProjectSnapshotJsonConverter.cs
deleted file mode 100644
index 988d42b44dcb..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/ProjectSnapshotJsonConverter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Newtonsoft.Json;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor.Serialization
-{
-    // We can't truly serialize a snapshot because it has access to a Workspace Project\
-    //
-    // Instead we serialize to a ProjectSnapshotHandle and then use that to re-create the snapshot
-    // inside the remote host.
-    internal class ProjectSnapshotJsonConverter : JsonConverter
-    {
-        public static readonly ProjectSnapshotJsonConverter Instance = new ProjectSnapshotJsonConverter();
-
-        public override bool CanRead => false;
-
-        public override bool CanWrite => true;
-        
-        public override bool CanConvert(Type objectType)
-        {
-            return typeof(ProjectSnapshot).IsAssignableFrom(objectType);
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var project = (ProjectSnapshot)value;
-            var handle = new ProjectSnapshotHandle(project.FilePath, project.Configuration, project.WorkspaceProject?.Id);
-
-            ProjectSnapshotHandleJsonConverter.Instance.WriteJson(writer, handle, serializer);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/RazorConfigurationJsonConverter.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/RazorConfigurationJsonConverter.cs
deleted file mode 100644
index 26be8c52b7d1..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/RazorConfigurationJsonConverter.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor.Serialization
-{
-    internal class RazorConfigurationJsonConverter : JsonConverter
-    {
-        public static readonly RazorConfigurationJsonConverter Instance = new RazorConfigurationJsonConverter();
-
-        public override bool CanConvert(Type objectType)
-        {
-            return typeof(RazorConfiguration).IsAssignableFrom(objectType);
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            if (reader.TokenType != JsonToken.StartObject)
-            {
-                return null;
-            }
-
-            var obj = JObject.Load(reader);
-            var configurationName = obj[nameof(RazorConfiguration.ConfigurationName)].Value<string>();
-            var languageVersion = obj[nameof(RazorConfiguration.LanguageVersion)].Value<string>();
-            var extensions = obj[nameof(RazorConfiguration.Extensions)].ToObject<RazorExtension[]>(serializer);
-
-            return RazorConfiguration.Create(RazorLanguageVersion.Parse(languageVersion), configurationName, extensions);
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var configuration = (RazorConfiguration)value;
-
-            writer.WriteStartObject();
-
-            writer.WritePropertyName(nameof(RazorConfiguration.ConfigurationName));
-            writer.WriteValue(configuration.ConfigurationName);
-
-            writer.WritePropertyName(nameof(RazorConfiguration.LanguageVersion));
-            writer.WriteValue(configuration.LanguageVersion.ToString());
-
-            writer.WritePropertyName(nameof(RazorConfiguration.Extensions));
-            serializer.Serialize(writer, configuration.Extensions);
-
-            writer.WriteEndObject();
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/RazorExtensionJsonConverter.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/RazorExtensionJsonConverter.cs
deleted file mode 100644
index 0d84b8c93947..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/RazorExtensionJsonConverter.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor.Serialization
-{
-    internal class RazorExtensionJsonConverter : JsonConverter
-    {
-        public static readonly RazorExtensionJsonConverter Instance = new RazorExtensionJsonConverter();
-
-        public override bool CanConvert(Type objectType)
-        {
-            return typeof(RazorExtension).IsAssignableFrom(objectType);
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            if (reader.TokenType != JsonToken.StartObject)
-            {
-                return null;
-            }
-
-            var obj = JObject.Load(reader);
-            var extensionName = obj[nameof(RazorExtension.ExtensionName)].Value<string>();
-
-            return new SerializedRazorExtension(extensionName);
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var extension = (RazorExtension)value;
-
-            writer.WriteStartObject();
-
-            writer.WritePropertyName(nameof(RazorExtension.ExtensionName));
-            writer.WriteValue(extension.ExtensionName);
-
-            writer.WriteEndObject();
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/SerializedRazorExtension.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/SerializedRazorExtension.cs
deleted file mode 100644
index 0f0292534f33..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Serialization/SerializedRazorExtension.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor.Serialization
-{
-    internal class SerializedRazorExtension : RazorExtension
-    {
-        public SerializedRazorExtension(string extensionName)
-        {
-            if (extensionName == null)
-            {
-                throw new ArgumentNullException(nameof(extensionName));
-            }
-
-            ExtensionName = extensionName;
-        }
-
-        public override string ExtensionName { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioErrorReporter.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioErrorReporter.cs
deleted file mode 100644
index 766494cf1bea..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioErrorReporter.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Shell.Interop;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor
-{
-    internal class VisualStudioErrorReporter : ErrorReporter
-    {
-        private readonly IServiceProvider _services;
-
-        public VisualStudioErrorReporter(IServiceProvider services)
-        {
-            if (services == null)
-            {
-                throw new ArgumentNullException(nameof(services));
-            }
-
-            _services = services;
-        }
-
-        public override void ReportError(Exception exception)
-        {
-            if (exception == null)
-            {
-                return;
-            }
-
-            var activityLog = GetActivityLog();
-            if (activityLog != null)
-            {
-                var hr = activityLog.LogEntry(
-                    (uint)__ACTIVITYLOG_ENTRYTYPE.ALE_ERROR,
-                    "Razor Language Services",
-                    $"Error encountered:{Environment.NewLine}{exception}");
-                ErrorHandler.ThrowOnFailure(hr);
-            }
-        }
-
-        public override void ReportError(Exception exception, ProjectSnapshot project)
-        {
-            if (exception == null)
-            {
-                return;
-            }
-
-            var activityLog = GetActivityLog();
-            if (activityLog != null)
-            {
-                var hr = activityLog.LogEntry(
-                    (uint)__ACTIVITYLOG_ENTRYTYPE.ALE_ERROR,
-                    "Razor Language Services",
-                    $"Error encountered from project '{project?.FilePath}':{Environment.NewLine}{exception}");
-                ErrorHandler.ThrowOnFailure(hr);
-            }
-        }
-
-        public override void ReportError(Exception exception, Project workspaceProject)
-        {
-            if (exception == null)
-            {
-                return;
-            }
-
-            var activityLog = GetActivityLog();
-            if (activityLog != null)
-            {
-                var hr = activityLog.LogEntry(
-                    (uint)__ACTIVITYLOG_ENTRYTYPE.ALE_ERROR,
-                    "Razor Language Services",
-                    $"Error encountered from project '{workspaceProject?.Name}' '{workspaceProject?.FilePath}':{Environment.NewLine}{exception}");
-                ErrorHandler.ThrowOnFailure(hr);
-            }
-        }
-
-        private IVsActivityLog GetActivityLog()
-        {
-            return _services.GetService(typeof(SVsActivityLog)) as IVsActivityLog;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioErrorReporterFactory.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioErrorReporterFactory.cs
deleted file mode 100644
index 5a59a5a77e17..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioErrorReporterFactory.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Shell;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor
-{
-    [Shared]
-    [ExportWorkspaceServiceFactory(typeof(ErrorReporter), ServiceLayer.Host)]
-    internal class VisualStudioErrorReporterFactory : IWorkspaceServiceFactory
-    {
-        private readonly IServiceProvider _serviceProvider;
-
-        [ImportingConstructor]
-        public VisualStudioErrorReporterFactory(SVsServiceProvider serviceProvider)
-        {
-            if (serviceProvider == null)
-            {
-                throw new ArgumentNullException(nameof(serviceProvider));
-            }
-
-            _serviceProvider = serviceProvider;
-        }
-
-        public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
-        {
-            return new VisualStudioErrorReporter(_serviceProvider);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioForegroundDispatcher.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioForegroundDispatcher.cs
deleted file mode 100644
index 6b80023b68d1..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioForegroundDispatcher.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.ComponentModel.Composition;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Shell;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(ForegroundDispatcher))]
-    internal class VisualStudioForegroundDispatcher : ForegroundDispatcher
-    {
-        public override TaskScheduler BackgroundScheduler { get; } = TaskScheduler.Default;
-
-        public override TaskScheduler ForegroundScheduler { get; } = TaskScheduler.FromCurrentSynchronizationContext();
-
-        public override bool IsForegroundThread => ThreadHelper.CheckAccess();
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VsSolutionUpdatesProjectSnapshotChangeTrigger.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VsSolutionUpdatesProjectSnapshotChangeTrigger.cs
deleted file mode 100644
index 92c0ac80a0c4..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VsSolutionUpdatesProjectSnapshotChangeTrigger.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.ComponentModel.Composition;
-using System.Runtime.InteropServices;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Editor.Razor;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor
-{
-    [Export(typeof(ProjectSnapshotChangeTrigger))]
-    internal class VsSolutionUpdatesProjectSnapshotChangeTrigger : ProjectSnapshotChangeTrigger, IVsUpdateSolutionEvents2
-    {
-        private readonly IServiceProvider _services;
-        private readonly TextBufferProjectService _projectService;
-
-        private ProjectSnapshotManagerBase _projectManager;
-
-        [ImportingConstructor]
-        public VsSolutionUpdatesProjectSnapshotChangeTrigger(
-            [Import(typeof(SVsServiceProvider))] IServiceProvider services,
-            TextBufferProjectService projectService)
-        {
-            if (services == null)
-            {
-                throw new ArgumentNullException(nameof(services));
-            }
-
-            if (projectService == null)
-            {
-                throw new ArgumentNullException(nameof(projectService));
-            }
-
-            _services = services;
-            _projectService = projectService;
-        }
-
-        public override void Initialize(ProjectSnapshotManagerBase projectManager)
-        {
-            _projectManager = projectManager;
-
-            // Attach the event sink to solution update events.
-            var solutionBuildManager = _services.GetService(typeof(SVsSolutionBuildManager)) as IVsSolutionBuildManager;
-            if (solutionBuildManager != null)
-            {
-                // We expect this to be called only once. So we don't need to Unadvise.
-                var hr = solutionBuildManager.AdviseUpdateSolutionEvents(this, out var cookie);
-                Marshal.ThrowExceptionForHR(hr);
-            }
-        }
-
-        public int UpdateSolution_Begin(ref int pfCancelUpdate)
-        {
-            return VSConstants.S_OK;
-        }
-
-        public int UpdateSolution_Done(int fSucceeded, int fModified, int fCancelCommand)
-        {
-            return VSConstants.S_OK;
-        }
-
-        public int UpdateSolution_StartUpdate(ref int pfCancelUpdate)
-        {
-            return VSConstants.S_OK;
-        }
-
-        public int UpdateSolution_Cancel()
-        {
-            return VSConstants.S_OK;
-        }
-
-        public int OnActiveProjectCfgChange(IVsHierarchy pIVsHierarchy)
-        {
-            return VSConstants.S_OK;
-        }
-
-        public int UpdateProjectCfg_Begin(IVsHierarchy pHierProj, IVsCfg pCfgProj, IVsCfg pCfgSln, uint dwAction, ref int pfCancel)
-        {
-            return VSConstants.S_OK;
-        }
-
-        // This gets called when the project has finished building.
-        public int UpdateProjectCfg_Done(IVsHierarchy pHierProj, IVsCfg pCfgProj, IVsCfg pCfgSln, uint dwAction, int fSuccess, int fCancel)
-        {
-            var projectPath = _projectService.GetProjectPath(pHierProj);
-            var project = _projectManager.GetLoadedProject(projectPath);
-            if (project != null && project.WorkspaceProject != null)
-            {
-                var workspaceProject = _projectManager.Workspace.CurrentSolution.GetProject(project.WorkspaceProject.Id);
-                if (workspaceProject != null)
-                {
-                    // Trigger a tag helper update by forcing the project manager to see the workspace Project
-                    // from the current solution.
-                    _projectManager.WorkspaceProjectChanged(workspaceProject);
-                }
-            }
-
-            return VSConstants.S_OK;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/DefaultVisualStudioMacWorkspaceAccessor.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/DefaultVisualStudioMacWorkspaceAccessor.cs
deleted file mode 100644
index eeac75968a24..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/DefaultVisualStudioMacWorkspaceAccessor.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.ComponentModel.Composition;
-using Microsoft.VisualStudio.Editor.Razor;
-using Microsoft.VisualStudio.Text;
-using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Projects;
-using Workspace = Microsoft.CodeAnalysis.Workspace;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(VisualStudioWorkspaceAccessor))]
-    [Export(typeof(VisualStudioMacWorkspaceAccessor))]
-    internal class DefaultVisualStudioMacWorkspaceAccessor : VisualStudioMacWorkspaceAccessor
-    {
-        private readonly TextBufferProjectService _projectService;
-
-        [ImportingConstructor]
-        public DefaultVisualStudioMacWorkspaceAccessor(TextBufferProjectService projectService)
-        {
-            if (projectService == null)
-            {
-                throw new ArgumentNullException(nameof(projectService));
-            }
-
-            _projectService = projectService;
-        }
-
-        public override bool TryGetWorkspace(ITextBuffer textBuffer, out Workspace workspace)
-        {
-            if (textBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(textBuffer));
-            }
-
-            // We do a best effort approach in this method to get the workspace that belongs to the TextBuffer.
-            // Below we try and find the project and then the solution that contains the given text buffer. If 
-            // we're able to find both the project and solution then we use the solution to look up the corresponding 
-            // Workspace using MonoDevelops TypeSystemService.
-
-            var hostProject = (DotNetProject)_projectService.GetHostProject(textBuffer);
-            if (hostProject == null)
-            {
-                // Does not have a host project.
-                workspace = null;
-                return false;
-            }
-
-            var hostSolution = hostProject.ParentSolution;
-            if (hostSolution == null)
-            {
-                // Project does not have a solution
-                workspace = null;
-                return false;
-            }
-
-            return TryGetWorkspace(hostSolution, out workspace);
-        }
-
-        public override bool TryGetWorkspace(Solution solution, out Workspace workspace)
-        {
-            if (solution == null)
-            {
-                throw new ArgumentNullException(nameof(solution));
-            }
-
-            workspace = TypeSystemService.GetWorkspace(solution);
-
-            // Workspace cannot be null at this point. If TypeSystemService.GetWorkspace isn't able to find a corresponding
-            // workspace it returns an empty workspace. Therefore, in order to see if we have a valid workspace we need to
-            // cross-check it against the list of active non-empty workspaces.
-
-            if (!TypeSystemService.AllWorkspaces.Contains(workspace))
-            {
-                // We were returned the empty workspace which is equivalent to us not finding a valid workspace for our text buffer.
-                workspace = null;
-                return false;
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Documents/VisualStudioMacFileChangeTracker.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Documents/VisualStudioMacFileChangeTracker.cs
deleted file mode 100644
index 327f632e369f..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Documents/VisualStudioMacFileChangeTracker.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Razor;
-using MonoDevelop.Core;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    internal class VisualStudioMacFileChangeTracker : FileChangeTracker
-    {
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly string _normalizedFilePath;
-        private bool _listening;
-
-        public override event EventHandler<FileChangeEventArgs> Changed;
-
-        public VisualStudioMacFileChangeTracker(
-            string filePath,
-            ForegroundDispatcher foregroundDispatcher)
-        {
-            if (string.IsNullOrEmpty(filePath))
-            {
-                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(filePath));
-            }
-
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            FilePath = filePath;
-            _normalizedFilePath = NormalizePath(FilePath);
-            _foregroundDispatcher = foregroundDispatcher;
-        }
-
-        public override string FilePath { get; }
-
-        public override void StartListening()
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (_listening)
-            {
-                return;
-            }
-
-            AttachToFileServiceEvents();
-
-            _listening = true;
-        }
-
-        public override void StopListening()
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (!_listening)
-            {
-                return;
-            }
-
-            DetachFromFileServiceEvents();
-
-            _listening = false;
-        }
-
-        // Virtual for testing
-        protected virtual void AttachToFileServiceEvents()
-        {
-            FileService.FileChanged += FileService_FileChanged;
-            FileService.FileCreated += FileService_FileCreated;
-            FileService.FileRemoved += FileService_FileRemoved;
-        }
-
-        // Virtual for testing
-        protected virtual void DetachFromFileServiceEvents()
-        {
-            FileService.FileChanged -= FileService_FileChanged;
-            FileService.FileCreated -= FileService_FileCreated;
-            FileService.FileRemoved -= FileService_FileRemoved;
-        }
-
-        private void FileService_FileChanged(object sender, FileEventArgs args) => HandleFileChangeEvent(FileChangeKind.Changed, args);
-
-        private void FileService_FileCreated(object sender, FileEventArgs args) => HandleFileChangeEvent(FileChangeKind.Added, args);
-
-        private void FileService_FileRemoved(object sender, FileEventArgs args) => HandleFileChangeEvent(FileChangeKind.Removed, args);
-
-        private void HandleFileChangeEvent(FileChangeKind changeKind, FileEventArgs args)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (Changed == null)
-            {
-                return;
-            }
-
-            foreach (var fileEvent in args)
-            {
-                if (fileEvent.IsDirectory)
-                {
-                    continue;
-                }
-
-                var normalizedEventPath = NormalizePath(fileEvent.FileName.FullPath);
-                if (string.Equals(_normalizedFilePath, normalizedEventPath, StringComparison.OrdinalIgnoreCase))
-                {
-                    OnChanged(changeKind);
-                    return;
-                }
-            }
-        }
-
-        private void OnChanged(FileChangeKind changeKind)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            var args = new FileChangeEventArgs(FilePath, changeKind);
-            Changed?.Invoke(this, args);
-        }
-
-        private static string NormalizePath(string path)
-        {
-            path = path.Replace('\\', '/');
-
-            return path;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Documents/VisualStudioMacFileChangeTrackerFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Documents/VisualStudioMacFileChangeTrackerFactory.cs
deleted file mode 100644
index 81c6e4431c59..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Documents/VisualStudioMacFileChangeTrackerFactory.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    internal class VisualStudioMacFileChangeTrackerFactory : FileChangeTrackerFactory
-    {
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-
-        public VisualStudioMacFileChangeTrackerFactory(ForegroundDispatcher foregroundDispatcher)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-        }
-
-        public override FileChangeTracker Create(string filePath)
-        {
-            if (string.IsNullOrEmpty(filePath))
-            {
-                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(filePath));
-            }
-
-            var fileChangeTracker = new VisualStudioMacFileChangeTracker(filePath, _foregroundDispatcher);
-            return fileChangeTracker;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Documents/VisualStudioMacFileChangeTrackerFactoryFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Documents/VisualStudioMacFileChangeTrackerFactoryFactory.cs
deleted file mode 100644
index 7eb83a3a48e7..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Documents/VisualStudioMacFileChangeTrackerFactoryFactory.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    [Shared]
-    [ExportWorkspaceService(typeof(FileChangeTrackerFactory), ServiceLayer.Host)]
-    internal class VisualStudioMacFileChangeTrackerFactoryFactory : IWorkspaceServiceFactory
-    {
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-
-        [ImportingConstructor]
-        public VisualStudioMacFileChangeTrackerFactoryFactory(ForegroundDispatcher foregroundDispatcher)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-        }
-
-        public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
-        {
-            if (workspaceServices == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceServices));
-            }
-
-            return new VisualStudioMacFileChangeTrackerFactory(_foregroundDispatcher);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Editor/DefaultTextBufferProjectService.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Editor/DefaultTextBufferProjectService.cs
deleted file mode 100644
index 02a4541958b0..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Editor/DefaultTextBufferProjectService.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.ComponentModel.Composition;
-using Microsoft.VisualStudio.Editor.Razor;
-using Microsoft.VisualStudio.Text;
-using MonoDevelop.Ide;
-using MonoDevelop.Projects;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor.Editor
-{
-    /// <summary>
-    /// Infrastructure methods to find project information from an <see cref="ITextBuffer"/>.
-    /// </summary>
-    [System.Composition.Shared]
-    [Export(typeof(TextBufferProjectService))]
-    internal class DefaultTextBufferProjectService : TextBufferProjectService
-    {
-        private const string DotNetCoreRazorCapability = "DotNetCoreRazor | AspNetCore";
-        private readonly ITextDocumentFactoryService _documentFactory;
-
-        [ImportingConstructor]
-        public DefaultTextBufferProjectService(ITextDocumentFactoryService documentFactory)
-        {
-            if (documentFactory == null)
-            {
-                throw new ArgumentNullException(nameof(documentFactory));
-            }
-
-            _documentFactory = documentFactory;
-        }
-
-        public override object GetHostProject(ITextBuffer textBuffer)
-        {
-            if (textBuffer == null)
-            {
-                throw new ArgumentNullException(nameof(textBuffer));
-            }
-
-            // If there's no document we can't find the FileName, or look for an associated project.
-            if (!_documentFactory.TryGetTextDocument(textBuffer, out var textDocument))
-            {
-                return null;
-            }
-
-            var projectsContainingFilePath = IdeApp.Workspace.GetProjectsContainingFile(textDocument.FilePath);
-            foreach (var project in projectsContainingFilePath)
-            {
-                if (!(project is DotNetProject))
-                {
-                    continue;
-                }
-
-                var projectFile = project.GetProjectFile(textDocument.FilePath);
-                if (!projectFile.IsHidden)
-                {
-                    return project;
-                }
-            }
-
-            return null;
-        }
-
-        public override string GetProjectPath(object project)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            var dotnetProject = (DotNetProject)project;
-            return dotnetProject.FileName.FullPath;
-        }
-
-        // VisualStudio for Mac only supports ASP.NET Core Razor.
-        public override bool IsSupportedProject(object project)
-        {
-            if (!(project is DotNetProject dotNetProject))
-            {
-                return false;
-            }
-
-            if (!dotNetProject.IsCapabilityMatch(DotNetCoreRazorCapability))
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        public override string GetProjectName(object project)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            var dotnetProject = (DotNetProject)project;
-
-            return dotnetProject.Name;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Editor/DefaultVisualStudioCompletionBroker.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Editor/DefaultVisualStudioCompletionBroker.cs
deleted file mode 100644
index 6f932b419150..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Editor/DefaultVisualStudioCompletionBroker.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.VisualStudio.Editor.Razor;
-using Microsoft.VisualStudio.Text.Editor;
-using MonoDevelop.Ide.CodeCompletion;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor.Editor
-{
-    internal class DefaultVisualStudioCompletionBroker : VisualStudioCompletionBroker
-    {
-        private const string IsCompletionActiveKey = "RoslynCompletionPresenterSession.IsCompletionActive";
-
-        public override bool IsCompletionActive(ITextView textView)
-        {
-            if (textView == null)
-            {
-                throw new ArgumentNullException(nameof(textView));
-            }
-
-            if (!textView.HasAggregateFocus)
-            {
-                // Text view does not have focus, if the completion window is visible it's for a different text view.
-                return false;
-            }
-
-            if (CompletionWindowManager.IsVisible)
-            {
-                return true;
-            }
-
-            if (textView.Properties.TryGetProperty<bool>(IsCompletionActiveKey, out var visible))
-            {
-                return visible;
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Editor/DefaultVisualStudioCompletionBrokerFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Editor/DefaultVisualStudioCompletionBrokerFactory.cs
deleted file mode 100644
index a087c174717f..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Editor/DefaultVisualStudioCompletionBrokerFactory.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Editor.Razor;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor.Editor
-{
-    [Shared]
-    [ExportLanguageServiceFactory(typeof(VisualStudioCompletionBroker), RazorLanguage.Name, ServiceLayer.Default)]
-    internal class DefaultVisualStudioCompletionBrokerFactory : ILanguageServiceFactory
-    {
-        public ILanguageService CreateLanguageService(HostLanguageServices languageServices)
-        {
-            if (languageServices == null)
-            {
-                throw new ArgumentNullException(nameof(languageServices));
-            }
-
-            return new DefaultVisualStudioCompletionBroker();
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj
deleted file mode 100644
index 69e9071704ef..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
-    <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure for Visual Studio for Mac.</Description>
-    <EnableApiCheck>false</EnableApiCheck>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MonoDevelop.Sdk" Version="$(MonoDevelopSdkPackageVersion)" />
-    <PackageReference Include="System.ValueTuple" Version="$(SystemValueTuplePackageVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Editor.Razor\Microsoft.VisualStudio.Editor.Razor.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectBuildChangeTrigger.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectBuildChangeTrigger.cs
deleted file mode 100644
index 8dc8d94aa413..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectBuildChangeTrigger.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.ComponentModel.Composition;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Editor.Razor;
-using MonoDevelop.Ide;
-using MonoDevelop.Projects;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor
-{
-    [Export(typeof(ProjectSnapshotChangeTrigger))]
-    internal class ProjectBuildChangeTrigger : ProjectSnapshotChangeTrigger
-    {
-        private readonly TextBufferProjectService _projectService;
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private ProjectSnapshotManagerBase _projectManager;
-
-        [ImportingConstructor]
-        public ProjectBuildChangeTrigger(ForegroundDispatcher foregroundDispatcher, TextBufferProjectService projectService)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (projectService == null)
-            {
-                throw new ArgumentNullException(nameof(projectService));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _projectService = projectService;
-        }
-
-        // Internal for testing
-        internal ProjectBuildChangeTrigger(
-            ForegroundDispatcher foregroundDispatcher,
-            TextBufferProjectService projectService,
-            ProjectSnapshotManagerBase projectManager)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (projectService == null)
-            {
-                throw new ArgumentNullException(nameof(projectService));
-            }
-
-            if (projectManager == null)
-            {
-                throw new ArgumentNullException(nameof(projectManager));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _projectService = projectService;
-            _projectManager = projectManager;
-        }
-
-        public override void Initialize(ProjectSnapshotManagerBase projectManager)
-        {
-            if (projectManager == null)
-            {
-                throw new ArgumentNullException(nameof(projectManager));
-            }
-
-            _projectManager = projectManager;
-
-            IdeApp.ProjectOperations.EndBuild += ProjectOperations_EndBuild;
-        }
-
-        // Internal for testing
-        internal void ProjectOperations_EndBuild(object sender, BuildEventArgs args)
-        {
-            if (args == null)
-            {
-                throw new ArgumentNullException(nameof(args));
-            }
-
-            _foregroundDispatcher.AssertForegroundThread();
-
-            if (!args.Success)
-            {
-                // Build failed
-                return;
-            }
-
-            var projectItem = args.SolutionItem;
-            if (!_projectService.IsSupportedProject(projectItem))
-            {
-                // We're hooked into all build events, it's possible to get called with an unsupported project item type.
-                return;
-            }
-
-            var projectPath = _projectService.GetProjectPath(projectItem);
-            var project = _projectManager.GetLoadedProject(projectPath);
-            if (project != null && project.WorkspaceProject != null)
-            {
-                var workspaceProject = _projectManager.Workspace.CurrentSolution.GetProject(project.WorkspaceProject.Id);
-                if (workspaceProject != null)
-                {
-                    // Trigger a tag helper update by forcing the project manager to see the workspace Project
-                    // from the current solution.
-                    _projectManager.WorkspaceProjectChanged(workspaceProject);
-                }
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/DefaultDotNetProjectHost.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/DefaultDotNetProjectHost.cs
deleted file mode 100644
index f66d2774fb72..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/DefaultDotNetProjectHost.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Editor.Razor;
-using MonoDevelop.Projects;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor.ProjectSystem
-{
-    internal class DefaultDotNetProjectHost : DotNetProjectHost
-    {
-        private const string ExplicitRazorConfigurationCapability = "DotNetCoreRazorConfiguration";
-
-        private readonly DotNetProject _project;
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly VisualStudioMacWorkspaceAccessor _workspaceAccessor;
-        private readonly TextBufferProjectService _projectService;
-        private RazorProjectHostBase _razorProjectHost;
-
-        public DefaultDotNetProjectHost(
-            DotNetProject project,
-            ForegroundDispatcher foregroundDispatcher,
-            VisualStudioMacWorkspaceAccessor workspaceAccessor,
-            TextBufferProjectService projectService)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (workspaceAccessor == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceAccessor));
-            }
-
-            if (projectService == null)
-            {
-                throw new ArgumentNullException(nameof(projectService));
-            }
-
-            _project = project;
-            _foregroundDispatcher = foregroundDispatcher;
-            _workspaceAccessor = workspaceAccessor;
-            _projectService = projectService;
-        }
-
-        // Internal for testing
-        internal DefaultDotNetProjectHost(
-            ForegroundDispatcher foregroundDispatcher,
-            VisualStudioMacWorkspaceAccessor workspaceAccessor,
-            TextBufferProjectService projectService)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (workspaceAccessor == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceAccessor));
-            }
-
-            if (projectService == null)
-            {
-                throw new ArgumentNullException(nameof(projectService));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _workspaceAccessor = workspaceAccessor;
-            _projectService = projectService;
-        }
-
-        public override DotNetProject Project => _project;
-
-        public override void Subscribe()
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            UpdateRazorHostProject();
-
-            _project.ProjectCapabilitiesChanged += Project_ProjectCapabilitiesChanged;
-            _project.Disposing += Project_Disposing;
-        }
-
-        private void Project_Disposing(object sender, EventArgs e)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            _project.ProjectCapabilitiesChanged -= Project_ProjectCapabilitiesChanged;
-            _project.Disposing -= Project_Disposing;
-
-            DetatchCurrentRazorProjectHost();
-        }
-
-        private void Project_ProjectCapabilitiesChanged(object sender, EventArgs e) => UpdateRazorHostProject();
-
-        // Internal for testing
-        internal void UpdateRazorHostProject()
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            DetatchCurrentRazorProjectHost();
-
-            if (!_projectService.IsSupportedProject(_project))
-            {
-                // Not a Razor compatible project.
-                return;
-            }
-
-            if (!TryGetProjectSnapshotManager(out var projectSnapshotManager))
-            {
-                // Could not get a ProjectSnapshotManager for the current project.
-                return;
-            }
-
-            if (_project.IsCapabilityMatch(ExplicitRazorConfigurationCapability))
-            {
-                // SDK >= 2.1
-                _razorProjectHost = new DefaultRazorProjectHost(_project, _foregroundDispatcher, projectSnapshotManager);
-                return;
-            }
-
-            // We're an older version of Razor at this point, SDK < 2.1
-            _razorProjectHost = new FallbackRazorProjectHost(_project, _foregroundDispatcher, projectSnapshotManager);
-        }
-
-        private bool TryGetProjectSnapshotManager(out ProjectSnapshotManagerBase projectSnapshotManagerBase)
-        {
-            if (!_workspaceAccessor.TryGetWorkspace(_project.ParentSolution, out var workspace))
-            {
-                // Could not locate workspace for razor project. Project is most likely tearing down.
-                projectSnapshotManagerBase = null;
-                return false;
-            }
-
-            var languageService = workspace.Services.GetLanguageServices(RazorLanguage.Name);
-            projectSnapshotManagerBase = (ProjectSnapshotManagerBase)languageService.GetRequiredService<ProjectSnapshotManager>();
-
-            return true;
-        }
-
-        private void DetatchCurrentRazorProjectHost()
-        {
-            _razorProjectHost?.Detatch();
-            _razorProjectHost = null;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/DefaultRazorProjectHost.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/DefaultRazorProjectHost.cs
deleted file mode 100644
index 587c7f7b9e45..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/DefaultRazorProjectHost.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.MSBuild;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor.ProjectSystem
-{
-    internal class DefaultRazorProjectHost : RazorProjectHostBase
-    {
-        private const string RazorLangVersionProperty = "RazorLangVersion";
-        private const string RazorDefaultConfigurationProperty = "RazorDefaultConfiguration";
-        private const string RazorExtensionItemType = "RazorExtension";
-        private const string RazorConfigurationItemType = "RazorConfiguration";
-        private const string RazorConfigurationItemTypeExtensionsProperty = "Extensions";
-
-        public DefaultRazorProjectHost(
-            DotNetProject project,
-            ForegroundDispatcher foregroundDispatcher,
-            ProjectSnapshotManagerBase projectSnapshotManager)
-            : base(project, foregroundDispatcher, projectSnapshotManager)
-        {
-        }
-
-        protected override async Task OnProjectChangedAsync()
-        {
-            ForegroundDispatcher.AssertBackgroundThread();
-
-            await ExecuteWithLockAsync(async () =>
-            {
-                var projectProperties = DotNetProject.MSBuildProject.EvaluatedProperties;
-                var projectItems = DotNetProject.MSBuildProject.EvaluatedItems;
-
-                if (TryGetConfiguration(projectProperties, projectItems, out var configuration))
-                {
-                    var hostProject = new HostProject(DotNetProject.FileName.FullPath, configuration);
-                    await UpdateHostProjectUnsafeAsync(hostProject).ConfigureAwait(false);
-                }
-                else
-                {
-                    // Ok we can't find a configuration. Let's assume this project isn't using Razor then.
-                    await UpdateHostProjectUnsafeAsync(null).ConfigureAwait(false);
-                }
-            });
-        }
-
-        // Internal for testing
-        internal static bool TryGetConfiguration(
-            IMSBuildEvaluatedPropertyCollection projectProperties,
-            IEnumerable<IMSBuildItemEvaluated> projectItems,
-            out RazorConfiguration configuration)
-        {
-            if (!TryGetDefaultConfiguration(projectProperties, out var defaultConfiguration))
-            {
-                configuration = null;
-                return false;
-            }
-
-            if (!TryGetLanguageVersion(projectProperties, out var languageVersion))
-            {
-                configuration = null;
-                return false;
-            }
-
-            if (!TryGetConfigurationItem(defaultConfiguration, projectItems, out var configurationItem))
-            {
-                configuration = null;
-                return false;
-            }
-
-            if (!TryGetConfiguredExtensionNames(configurationItem, out var configuredExtensionNames))
-            {
-                configuration = null;
-                return false;
-            }
-
-            var extensions = GetExtensions(configuredExtensionNames, projectItems);
-            configuration = new ProjectSystemRazorConfiguration(languageVersion, configurationItem.Include, extensions);
-            return true;
-        }
-
-
-        // Internal for testing
-        internal static bool TryGetDefaultConfiguration(IMSBuildEvaluatedPropertyCollection projectProperties, out string defaultConfiguration)
-        {
-            defaultConfiguration = projectProperties.GetValue(RazorDefaultConfigurationProperty);
-            if (string.IsNullOrEmpty(defaultConfiguration))
-            {
-                defaultConfiguration = null;
-                return false;
-            }
-
-            return true;
-        }
-
-        // Internal for testing
-        internal static bool TryGetLanguageVersion(IMSBuildEvaluatedPropertyCollection projectProperties, out RazorLanguageVersion languageVersion)
-        {
-            var languageVersionValue = projectProperties.GetValue(RazorLangVersionProperty);
-            if (string.IsNullOrEmpty(languageVersionValue))
-            {
-                languageVersion = null;
-                return false;
-            }
-
-            if (!RazorLanguageVersion.TryParse(languageVersionValue, out languageVersion))
-            {
-                languageVersion = RazorLanguageVersion.Latest;
-            }
-
-            return true;
-        }
-
-        // Internal for testing
-        internal static bool TryGetConfigurationItem(
-            string configuration,
-            IEnumerable<IMSBuildItemEvaluated> projectItems,
-            out IMSBuildItemEvaluated configurationItem)
-        {
-            foreach (var item in projectItems)
-            {
-                if (item.Name == RazorConfigurationItemType && item.Include == configuration)
-                {
-                    configurationItem = item;
-                    return true;
-                }
-            }
-
-            configurationItem = null;
-            return false;
-        }
-
-        // Internal for testing
-        internal static bool TryGetConfiguredExtensionNames(IMSBuildItemEvaluated configurationItem, out string[] configuredExtensionNames)
-        {
-            var extensionNamesValue = configurationItem.Metadata.GetValue(RazorConfigurationItemTypeExtensionsProperty);
-
-            if (string.IsNullOrEmpty(extensionNamesValue))
-            {
-                configuredExtensionNames = null;
-                return false;
-            }
-            
-            configuredExtensionNames = extensionNamesValue.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
-            return true;
-        }
-
-        // Internal for testing
-        internal static ProjectSystemRazorExtension[] GetExtensions(
-            string[] configuredExtensionNames,
-            IEnumerable<IMSBuildItemEvaluated> projectItems)
-        {
-            var extensions = new List<ProjectSystemRazorExtension>();
-
-            foreach (var item in projectItems)
-            {
-                if (item.Name != RazorExtensionItemType)
-                {
-                    // Not a RazorExtension
-                    continue;
-                }
-
-                var extensionName = item.Include;
-                if (configuredExtensionNames.Contains(extensionName))
-                {
-                    extensions.Add(new ProjectSystemRazorExtension(extensionName));
-                }
-            }
-
-            return extensions.ToArray();
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/DotNetProjectHost.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/DotNetProjectHost.cs
deleted file mode 100644
index d5933ef90f4d..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/DotNetProjectHost.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using MonoDevelop.Projects;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor.ProjectSystem
-{
-    internal abstract class DotNetProjectHost
-    {
-        public abstract DotNetProject Project { get; }
-
-        public abstract void Subscribe();
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/DotNetProjectHostFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/DotNetProjectHostFactory.cs
deleted file mode 100644
index 9755b2dc1909..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/DotNetProjectHostFactory.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.ComponentModel.Composition;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Editor.Razor;
-using MonoDevelop.Projects;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor.ProjectSystem
-{
-    [System.Composition.Shared]
-    [Export(typeof(DotNetProjectHostFactory))]
-    internal class DotNetProjectHostFactory
-    {
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly VisualStudioMacWorkspaceAccessor _workspaceAccessor;
-        private readonly TextBufferProjectService _projectService;
-
-        [ImportingConstructor]
-        public DotNetProjectHostFactory(
-            ForegroundDispatcher foregroundDispatcher,
-            VisualStudioMacWorkspaceAccessor workspaceAccessor,
-            TextBufferProjectService projectService)
-        {
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (workspaceAccessor == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceAccessor));
-            }
-
-            if (projectService == null)
-            {
-                throw new ArgumentNullException(nameof(projectService));
-            }
-
-            _foregroundDispatcher = foregroundDispatcher;
-            _workspaceAccessor = workspaceAccessor;
-            _projectService = projectService;
-        }
-
-        public DotNetProjectHost Create(DotNetProject project)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            var projectHost = new DefaultDotNetProjectHost(project, _foregroundDispatcher, _workspaceAccessor, _projectService);
-            return projectHost;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/FallbackRazorProjectHost.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/FallbackRazorProjectHost.cs
deleted file mode 100644
index 170dd51ca254..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/FallbackRazorProjectHost.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Reflection.Metadata;
-using System.Reflection.PortableExecutable;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using MonoDevelop.Projects;
-using AssemblyReference = MonoDevelop.Projects.AssemblyReference;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor.ProjectSystem
-{
-    internal class FallbackRazorProjectHost : RazorProjectHostBase
-    {
-        private const string MvcAssemblyFileName = "Microsoft.AspNetCore.Mvc.Razor.dll";
-
-        public FallbackRazorProjectHost(
-            DotNetProject project,
-            ForegroundDispatcher foregroundDispatcher,
-            ProjectSnapshotManagerBase projectSnapshotManager)
-            : base(project, foregroundDispatcher, projectSnapshotManager)
-        {
-        }
-
-        protected override async Task OnProjectChangedAsync()
-        {
-            ForegroundDispatcher.AssertBackgroundThread();
-
-            await ExecuteWithLockAsync(async () =>
-            {
-                var referencedAssemblies = await DotNetProject.GetReferencedAssemblies(ConfigurationSelector.Default);
-                var mvcReference = referencedAssemblies.FirstOrDefault(IsMvcAssembly);
-
-                if (mvcReference == null)
-                {
-                    // Ok we can't find an MVC version. Let's assume this project isn't using Razor then.
-                    await UpdateHostProjectUnsafeAsync(null).ConfigureAwait(false);
-                    return;
-                }
-
-                var version = GetAssemblyVersion(mvcReference.FilePath);
-                if (version == null)
-                {
-                    // Ok we can't find an MVC version. Let's assume this project isn't using Razor then.
-                    await UpdateHostProjectUnsafeAsync(null).ConfigureAwait(false);
-                    return;
-                }
-
-                var configuration = FallbackRazorConfiguration.SelectConfiguration(version);
-                var hostProject = new HostProject(DotNetProject.FileName.FullPath, configuration);
-                await UpdateHostProjectUnsafeAsync(hostProject).ConfigureAwait(false);
-            });
-        }
-
-        // Internal for testing
-        internal static bool IsMvcAssembly(AssemblyReference reference)
-        {
-            var fileName = reference?.FilePath.FileName;
-
-            if (string.IsNullOrEmpty(fileName))
-            {
-                return false;
-            }
-
-            if (string.Equals(reference.FilePath.FileName, MvcAssemblyFileName, StringComparison.OrdinalIgnoreCase))
-            {
-                // Mvc assembly
-                return true;
-            }
-
-            return false;
-        }
-
-        private static Version GetAssemblyVersion(string filePath)
-        {
-            try
-            {
-                using (var stream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete))
-                using (var reader = new PEReader(stream))
-                {
-                    var metadataReader = reader.GetMetadataReader();
-
-                    var assemblyDefinition = metadataReader.GetAssemblyDefinition();
-                    return assemblyDefinition.Version;
-                }
-            }
-            catch
-            {
-                // We're purposely silencing any kinds of I/O exceptions here, just in case something wacky is going on.
-                return null;
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/RazorProjectHostBase.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/RazorProjectHostBase.cs
deleted file mode 100644
index c6afacad9332..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/ProjectSystem/RazorProjectHostBase.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Threading;
-using MonoDevelop.Projects;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor.ProjectSystem
-{
-    internal abstract class RazorProjectHostBase
-    {
-        // References changes are always triggered when project changes happen.
-        private const string ProjectChangedHint = "References";
-
-        private bool _batchingProjectChanges;
-        private readonly DotNetProject _dotNetProject;
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-        private readonly ProjectSnapshotManagerBase _projectSnapshotManager;
-        private readonly AsyncSemaphore _onProjectChangedInnerSemaphore;
-        private readonly AsyncSemaphore _projectChangedSemaphore;
-        private HostProject _currentHostProject;
-
-        public RazorProjectHostBase(
-            DotNetProject project,
-            ForegroundDispatcher foregroundDispatcher,
-            ProjectSnapshotManagerBase projectSnapshotManager)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            if (foregroundDispatcher == null)
-            {
-                throw new ArgumentNullException(nameof(foregroundDispatcher));
-            }
-
-            if (projectSnapshotManager == null)
-            {
-                throw new ArgumentNullException(nameof(projectSnapshotManager));
-            }
-
-            _dotNetProject = project;
-            _foregroundDispatcher = foregroundDispatcher;
-            _projectSnapshotManager = projectSnapshotManager;
-            _onProjectChangedInnerSemaphore = new AsyncSemaphore(initialCount: 1);
-            _projectChangedSemaphore = new AsyncSemaphore(initialCount: 1);
-
-            AttachToProject();
-        }
-
-        public DotNetProject DotNetProject => _dotNetProject;
-
-        public HostProject HostProject => _currentHostProject;
-
-        protected ForegroundDispatcher ForegroundDispatcher => _foregroundDispatcher;
-
-        public void Detatch()
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            DotNetProject.Modified -= DotNetProject_Modified;
-
-            UpdateHostProjectForeground(null);
-        }
-
-        protected abstract Task OnProjectChangedAsync();
-
-        // Protected virtual for testing
-        protected virtual void AttachToProject()
-        {
-            ForegroundDispatcher.AssertForegroundThread();
-
-            DotNetProject.Modified += DotNetProject_Modified;
-
-            // Trigger the initial update to the project.
-            _batchingProjectChanges = true;
-            Task.Factory.StartNew(ProjectChangedBackgroundAsync, null, CancellationToken.None, TaskCreationOptions.None, ForegroundDispatcher.BackgroundScheduler);
-        }
-
-        // Must be called inside the lock.
-        protected async Task UpdateHostProjectUnsafeAsync(HostProject newHostProject)
-        {
-            _foregroundDispatcher.AssertBackgroundThread();
-
-            await Task.Factory.StartNew(UpdateHostProjectForeground, newHostProject, CancellationToken.None, TaskCreationOptions.None, ForegroundDispatcher.ForegroundScheduler);
-        }
-
-        protected async Task ExecuteWithLockAsync(Func<Task> func)
-        {
-            using (await _projectChangedSemaphore.EnterAsync().ConfigureAwait(false))
-            {
-                await func().ConfigureAwait(false);
-            }
-        }
-
-        private async Task ProjectChangedBackgroundAsync(object state)
-        {
-            ForegroundDispatcher.AssertBackgroundThread();
-
-            _batchingProjectChanges = false;
-
-            // Ensure ordering, typically we'll only have 1 background thread in flight at a time. However,
-            // between this line and the one prior another background thread could have also entered this
-            // method. This is here to protect against us changing the order of project changed events.
-            using (await _onProjectChangedInnerSemaphore.EnterAsync().ConfigureAwait(false))
-            {
-                await OnProjectChangedAsync();
-            }
-        }
-
-        private void DotNetProject_Modified(object sender, SolutionItemModifiedEventArgs args)
-        {
-            if (args == null)
-            {
-                throw new ArgumentNullException(nameof(args));
-            }
-
-            ForegroundDispatcher.AssertForegroundThread();
-
-            if (_batchingProjectChanges)
-            {
-                // Already waiting to recompute host project, no need to do any more work to determine if we're dirty.
-                return;
-            }
-
-            var projectChanged = args.Any(arg => string.Equals(arg.Hint, ProjectChangedHint, StringComparison.Ordinal));
-            if (projectChanged)
-            {
-                // This method can be spammed for tons of project change events but all we really care about is "are we dirty?". 
-                // Therefore, we re-dispatch here to allow any remaining project change events to fire and to then only have 1 host
-                // project change trigger; this way we don't spam our own system with re-configure calls.
-                _batchingProjectChanges = true;
-                Task.Factory.StartNew(ProjectChangedBackgroundAsync, null, CancellationToken.None, TaskCreationOptions.None, ForegroundDispatcher.BackgroundScheduler);
-            }
-        }
-
-        private void UpdateHostProjectForeground(object state)
-        {
-            _foregroundDispatcher.AssertForegroundThread();
-
-            var newHostProject = (HostProject)state;
-
-            if (_currentHostProject == null && newHostProject == null)
-            {
-                // This is a no-op. This project isn't using Razor.
-            }
-            else if (_currentHostProject == null && newHostProject != null)
-            {
-                _projectSnapshotManager.HostProjectAdded(newHostProject);
-            }
-            else if (_currentHostProject != null && newHostProject == null)
-            {
-                _projectSnapshotManager.HostProjectRemoved(HostProject);
-            }
-            else
-            {
-                _projectSnapshotManager.HostProjectChanged(newHostProject);
-            }
-
-            _currentHostProject = newHostProject;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Properties/AssemblyInfo.cs
deleted file mode 100644
index e8a39ba34e2b..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Mac.RazorAddin, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Properties/Resources.Designer.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Properties/Resources.Designer.cs
deleted file mode 100644
index 9b9b6fb28fcd..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// <auto-generated />
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor
-{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class Resources
-    {
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.VisualStudio.Mac.LanguageServices.Razor.Resources", typeof(Resources).GetTypeInfo().Assembly);
-
-        /// <summary>
-        /// Value cannot be null or an empty string.
-        /// </summary>
-        internal static string ArgumentCannotBeNullOrEmpty
-        {
-            get => GetString("ArgumentCannotBeNullOrEmpty");
-        }
-
-        /// <summary>
-        /// Value cannot be null or an empty string.
-        /// </summary>
-        internal static string FormatArgumentCannotBeNullOrEmpty()
-            => GetString("ArgumentCannotBeNullOrEmpty");
-
-        /// <summary>
-        /// Razor Language Service error encountered.
-        /// </summary>
-        internal static string RazorLanguageServiceGeneralError
-        {
-            get => GetString("RazorLanguageServiceGeneralError");
-        }
-
-        /// <summary>
-        /// Razor Language Service error encountered.
-        /// </summary>
-        internal static string FormatRazorLanguageServiceGeneralError()
-            => GetString("RazorLanguageServiceGeneralError");
-
-        /// <summary>
-        /// Razor Language Service error encountered from project '{0}'.
-        /// </summary>
-        internal static string RazorLanguageServiceProjectError
-        {
-            get => GetString("RazorLanguageServiceProjectError");
-        }
-
-        /// <summary>
-        /// Razor Language Service error encountered from project '{0}'.
-        /// </summary>
-        internal static string FormatRazorLanguageServiceProjectError(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("RazorLanguageServiceProjectError"), p0);
-
-        /// <summary>
-        /// Error encountered from project '{0}':
-        /// {1}
-        /// </summary>
-        internal static string RazorLanguageServiceProjectSnapshotError
-        {
-            get => GetString("RazorLanguageServiceProjectSnapshotError");
-        }
-
-        /// <summary>
-        /// Error encountered from project '{0}':
-        /// {1}
-        /// </summary>
-        internal static string FormatRazorLanguageServiceProjectSnapshotError(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("RazorLanguageServiceProjectSnapshotError"), p0, p1);
-
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
-                }
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Resources.resx b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Resources.resx
deleted file mode 100644
index b5fa0a3947da..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Resources.resx
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
-    <value>Value cannot be null or an empty string.</value>
-  </data>
-  <data name="RazorLanguageServiceGeneralError" xml:space="preserve">
-    <value>Razor Language Service error encountered.</value>
-  </data>
-  <data name="RazorLanguageServiceProjectError" xml:space="preserve">
-    <value>Razor Language Service error encountered from project '{0}'.</value>
-  </data>
-  <data name="RazorLanguageServiceProjectSnapshotError" xml:space="preserve">
-    <value>Error encountered from project '{0}':
-{1}</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/VisualStudioErrorReporter.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/VisualStudioErrorReporter.cs
deleted file mode 100644
index 6535dfa99912..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/VisualStudioErrorReporter.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Diagnostics;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using MonoDevelop.Core;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor
-{
-    internal class VisualStudioErrorReporter : ErrorReporter
-    {
-        public override void ReportError(Exception exception)
-        {
-            if (exception == null)
-            {
-                Debug.Fail("Null exceptions should not be reported.");
-                return;
-            }
-
-            LoggingService.LogError(
-                Resources.RazorLanguageServiceGeneralError, 
-                exception);
-        }
-
-        public override void ReportError(Exception exception, Project project)
-        {
-            if (exception == null)
-            {
-                Debug.Fail("Null exceptions should not be reported.");
-                return;
-            }
-
-            LoggingService.LogError(
-                Resources.FormatRazorLanguageServiceProjectError(project?.Name), 
-                exception);
-        }
-
-        public override void ReportError(Exception exception, ProjectSnapshot project)
-        {
-            if (exception == null)
-            {
-                Debug.Fail("Null exceptions should not be reported.");
-                return;
-            }
-
-            LoggingService.LogError(
-                Resources.FormatRazorLanguageServiceProjectSnapshotError(project?.FilePath, exception),
-                exception);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/VisualStudioErrorReporterFactory.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/VisualStudioErrorReporterFactory.cs
deleted file mode 100644
index 779cd87a547f..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/VisualStudioErrorReporterFactory.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Composition;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor
-{
-    [Shared]
-    [ExportWorkspaceServiceFactory(typeof(ErrorReporter), ServiceLayer.Host)]
-    internal class VisualStudioErrorReporterFactory : IWorkspaceServiceFactory
-    {
-        public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
-        {
-            return new VisualStudioErrorReporter();
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/VisualStudioForegroundDispatcher.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/VisualStudioForegroundDispatcher.cs
deleted file mode 100644
index 789171cf0599..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/VisualStudioForegroundDispatcher.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.ComponentModel.Composition;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor
-{
-    [System.Composition.Shared]
-    [Export(typeof(ForegroundDispatcher))]
-    internal class VisualStudioForegroundDispatcher : ForegroundDispatcher
-    {
-        public override TaskScheduler BackgroundScheduler { get; } = TaskScheduler.Default;
-
-        public override TaskScheduler ForegroundScheduler { get; } = MonoDevelop.Core.Runtime.MainTaskScheduler;
-
-        public override bool IsForegroundThread => MonoDevelop.Core.Runtime.IsMainThread;
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/VisualStudioMacWorkspaceAccessor.cs b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/VisualStudioMacWorkspaceAccessor.cs
deleted file mode 100644
index 9056f3864d91..000000000000
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/VisualStudioMacWorkspaceAccessor.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.VisualStudio.Editor.Razor;
-using MonoDevelop.Projects;
-using Workspace = Microsoft.CodeAnalysis.Workspace;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor
-{
-    internal abstract class VisualStudioMacWorkspaceAccessor : VisualStudioWorkspaceAccessor
-    {
-        public abstract bool TryGetWorkspace(Solution solution, out Workspace workspace);
-    }
-}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj
deleted file mode 100644
index c32bd8557748..000000000000
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net46;$(StandardTestTfms)</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/TestLanguageServices.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/TestLanguageServices.cs
deleted file mode 100644
index f5e9286fb27e..000000000000
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/TestLanguageServices.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.CodeAnalysis.Host
-{
-    internal class TestLanguageServices : HostLanguageServices
-    {
-        private readonly HostWorkspaceServices _workspaceServices;
-        private readonly IEnumerable<ILanguageService> _languageServices;
-
-        public TestLanguageServices(HostWorkspaceServices workspaceServices, IEnumerable<ILanguageService> languageServices)
-        {
-            if (workspaceServices == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceServices));
-            }
-
-            if (languageServices == null)
-            {
-                throw new ArgumentNullException(nameof(languageServices));
-            }
-
-            _workspaceServices = workspaceServices;
-            _languageServices = languageServices;
-        }
-
-        public override HostWorkspaceServices WorkspaceServices => _workspaceServices;
-
-        public override string Language => RazorLanguage.Name;
-
-        public override TLanguageService GetService<TLanguageService>()
-        {
-            var service = _languageServices.OfType<TLanguageService>().FirstOrDefault();
-
-            if (service == null)
-            {
-                throw new InvalidOperationException($"Test Razor language services not configured properly, missing language service '{typeof(TLanguageService).FullName}'.");
-            }
-
-            return service;
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/TestServices.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/TestServices.cs
deleted file mode 100644
index a9e53de62149..000000000000
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/TestServices.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Microsoft.CodeAnalysis.Host
-{
-    public class TestServices : HostServices
-    {
-        private readonly IEnumerable<IWorkspaceService> _workspaceServices;
-        private readonly IEnumerable<ILanguageService> _razorLanguageServices;
-
-        private TestServices(IEnumerable<IWorkspaceService> workspaceServices, IEnumerable<ILanguageService> razorLanguageServices)
-        {
-            if (workspaceServices == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceServices));
-            }
-
-            if (razorLanguageServices == null)
-            {
-                throw new ArgumentNullException(nameof(razorLanguageServices));
-            }
-
-            _workspaceServices = workspaceServices;
-            _razorLanguageServices = razorLanguageServices;
-        }
-
-        protected override HostWorkspaceServices CreateWorkspaceServices(Workspace workspace)
-        {
-            if (workspace == null)
-            {
-                throw new ArgumentNullException(nameof(workspace));
-            }
-
-            return new TestWorkspaceServices(this, _workspaceServices, _razorLanguageServices, workspace);
-        }
-
-        public static HostServices Create(IEnumerable<ILanguageService> razorLanguageServices) 
-            => Create(Enumerable.Empty<IWorkspaceService>(), razorLanguageServices);
-
-        public static HostServices Create(IEnumerable<IWorkspaceService> workspaceServices, IEnumerable<ILanguageService> razorLanguageServices) 
-            => new TestServices(workspaceServices, razorLanguageServices);
-    }
-}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/TestWorkspace.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/TestWorkspace.cs
deleted file mode 100644
index 02dcab53d597..000000000000
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/TestWorkspace.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Host;
-
-namespace Microsoft.CodeAnalysis
-{
-    public static class TestWorkspace
-    {
-        private static readonly object WorkspaceLock = new object();
-
-        public static Workspace Create(Action<AdhocWorkspace> configure = null) => Create(services: null, configure: configure);
-
-        public static Workspace Create(HostServices services, Action<AdhocWorkspace> configure = null)
-        {
-            lock (WorkspaceLock)
-            {
-                var workspace = services == null ? new AdhocWorkspace() : new AdhocWorkspace(services);
-                configure?.Invoke(workspace);
-
-                return workspace;
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/TestWorkspaceServices.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/TestWorkspaceServices.cs
deleted file mode 100644
index 52b779915b69..000000000000
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/TestWorkspaceServices.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Microsoft.CodeAnalysis.Host
-{
-    internal class TestWorkspaceServices : HostWorkspaceServices
-    {
-        private static readonly Workspace DefaultWorkspace = TestWorkspace.Create();
-
-        private readonly HostServices _hostServices;
-        private readonly HostLanguageServices _razorLanguageServices;
-        private readonly IEnumerable<IWorkspaceService> _workspaceServices;
-        private readonly Workspace _workspace;
-
-        public TestWorkspaceServices(
-            HostServices hostServices,
-            IEnumerable<IWorkspaceService> workspaceServices,
-            IEnumerable<ILanguageService> languageServices,
-            Workspace workspace)
-        {
-            if (hostServices == null)
-            {
-                throw new ArgumentNullException(nameof(hostServices));
-            }
-
-            if (workspaceServices == null)
-            {
-                throw new ArgumentNullException(nameof(workspaceServices));
-            }
-
-            if (languageServices == null)
-            {
-                throw new ArgumentNullException(nameof(languageServices));
-            }
-
-            if (workspace == null)
-            {
-                throw new ArgumentNullException(nameof(workspace));
-            }
-
-            _hostServices = hostServices;
-            _workspaceServices = workspaceServices;
-            _workspace = workspace;
-
-            _razorLanguageServices = new TestLanguageServices(this, languageServices);
-        }
-
-        public override HostServices HostServices => _hostServices;
-
-        public override Workspace Workspace => _workspace;
-
-        public override TWorkspaceService GetService<TWorkspaceService>()
-        {
-            var service = _workspaceServices.OfType<TWorkspaceService>().FirstOrDefault();
-
-            if (service == null)
-            {
-                // Fallback to default host services to resolve roslyn specific features.
-                service = DefaultWorkspace.Services.GetService<TWorkspaceService>();
-            }
-
-            return service;
-        }
-
-        public override HostLanguageServices GetLanguageServices(string languageName)
-        {
-            if (languageName == RazorLanguage.Name)
-            {
-                return _razorLanguageServices;
-            }
-
-            // Fallback to default host services to resolve roslyn specific features.
-            return DefaultWorkspace.Services.GetLanguageServices(languageName);
-        }
-
-        public override IEnumerable<string> SupportedLanguages => new[] { RazorLanguage.Name };
-
-        public override bool IsSupported(string languageName) => languageName == RazorLanguage.Name;
-
-        public override IEnumerable<TLanguageService> FindLanguageServices<TLanguageService>(MetadataFilter filter) => throw new NotImplementedException();
-    }
-}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj
deleted file mode 100644
index 1967009f1fbc..000000000000
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
-    <PreserveCompilationContext>true</PreserveCompilationContext>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor.Workspaces\Microsoft.CodeAnalysis.Razor.Workspaces.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor\Microsoft.AspNetCore.Razor.csproj" />
-    <ProjectReference Include="..\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
-    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DefaultProjectSnapshotTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DefaultProjectSnapshotTest.cs
deleted file mode 100644
index 3dd6e35b532c..000000000000
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DefaultProjectSnapshotTest.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Host;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    public class DefaultProjectSnapshotTest
-    {
-        public DefaultProjectSnapshotTest()
-        {
-            TagHelperResolver = new TestTagHelperResolver();
-
-            HostServices = TestServices.Create(
-                new IWorkspaceService[]
-                {
-                    new TestProjectSnapshotProjectEngineFactory(),
-                },
-                new ILanguageService[]
-                {
-                    TagHelperResolver,
-                });
-
-            HostProject = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_2_0);
-            HostProjectWithConfigurationChange = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_1_0);
-
-            Workspace = TestWorkspace.Create(HostServices);
-
-            var projectId = ProjectId.CreateNewId("Test");
-            var solution = Workspace.CurrentSolution.AddProject(ProjectInfo.Create(
-                projectId,
-                VersionStamp.Default,
-                "Test",
-                "Test",
-                LanguageNames.CSharp,
-                "c:\\MyProject\\Test.csproj"));
-            WorkspaceProject = solution.GetProject(projectId);
-
-            SomeTagHelpers = new List<TagHelperDescriptor>();
-            SomeTagHelpers.Add(TagHelperDescriptorBuilder.Create("Test1", "TestAssembly").Build());
-
-            Documents = new HostDocument[]
-            {
-                new HostDocument("c:\\MyProject\\File.cshtml", "File.cshtml"),
-                new HostDocument("c:\\MyProject\\Index.cshtml", "Index.cshtml"),
-
-                // linked file
-                new HostDocument("c:\\SomeOtherProject\\Index.cshtml", "Pages\\Index.cshtml"),
-            };
-        }
-
-        private HostDocument[] Documents { get; }
-
-        private HostProject HostProject { get; }
-
-        private HostProject HostProjectWithConfigurationChange { get; }
-
-        private Project WorkspaceProject { get; }
-
-        private TestTagHelperResolver TagHelperResolver { get; }
-
-        private HostServices HostServices { get; }
-
-        private Workspace Workspace { get; }
-
-        private List<TagHelperDescriptor> SomeTagHelpers { get; }
-
-        [Fact]
-        public void ProjectSnapshot_CachesDocumentSnapshots()
-        {
-            // Arrange
-            var state = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[0], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader);
-            var snapshot = new DefaultProjectSnapshot(state);
-
-            // Act
-            var documents = snapshot.DocumentFilePaths.ToDictionary(f => f, f => snapshot.GetDocument(f));
-
-            // Assert
-            Assert.Collection(
-                documents,
-                d => Assert.Same(d.Value, snapshot.GetDocument(d.Key)),
-                d => Assert.Same(d.Value, snapshot.GetDocument(d.Key)),
-                d => Assert.Same(d.Value, snapshot.GetDocument(d.Key)));
-        }
-
-        [Fact]
-        public void ProjectSnapshot_CachesTagHelperTask()
-        {
-            // Arrange
-            TagHelperResolver.CompletionSource = new TaskCompletionSource<TagHelperResolutionResult>();
-
-            try
-            {
-                var state = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject);
-                var snapshot = new DefaultProjectSnapshot(state);
-
-                // Act
-                var task1 = snapshot.GetTagHelpersAsync();
-                var task2 = snapshot.GetTagHelpersAsync();
-
-                // Assert
-                Assert.Same(task1, task2);
-            }
-            finally
-            {
-                TagHelperResolver.CompletionSource.SetCanceled();
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DocumentStateTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DocumentStateTest.cs
deleted file mode 100644
index cf4db709e809..000000000000
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DocumentStateTest.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Text;
-using Moq;
-using Xunit;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    public class DocumentStateTest
-    {
-        public DocumentStateTest()
-        {
-            TagHelperResolver = new TestTagHelperResolver();
-
-            HostServices = TestServices.Create(
-                new IWorkspaceService[]
-                {
-                    new TestProjectSnapshotProjectEngineFactory(),
-                },
-                new ILanguageService[]
-                {
-                    TagHelperResolver,
-                });
-
-            HostProject = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_2_0);
-            HostProjectWithConfigurationChange = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_1_0);
-
-            Workspace = TestWorkspace.Create(HostServices);
-
-            var projectId = ProjectId.CreateNewId("Test");
-            var solution = Workspace.CurrentSolution.AddProject(ProjectInfo.Create(
-                projectId,
-                VersionStamp.Default,
-                "Test",
-                "Test",
-                LanguageNames.CSharp,
-                "c:\\MyProject\\Test.csproj"));
-            WorkspaceProject = solution.GetProject(projectId);
-
-            SomeTagHelpers = new List<TagHelperDescriptor>();
-            SomeTagHelpers.Add(TagHelperDescriptorBuilder.Create("Test1", "TestAssembly").Build());
-
-            Document = new HostDocument("c:\\MyProject\\File.cshtml", "File.cshtml");
-
-            Text = SourceText.From("Hello, world!");
-            TextLoader = () => Task.FromResult(TextAndVersion.Create(Text, VersionStamp.Create()));
-        }
-
-        private HostDocument Document { get; }
-
-        private HostProject HostProject { get; }
-
-        private HostProject HostProjectWithConfigurationChange { get; }
-
-        private Project WorkspaceProject { get; }
-
-        private TestTagHelperResolver TagHelperResolver { get; }
-
-        private HostServices HostServices { get; }
-
-        private Workspace Workspace { get; }
-
-        private List<TagHelperDescriptor> SomeTagHelpers { get; }
-
-        private Func<Task<TextAndVersion>> TextLoader { get; }
-
-        private SourceText Text { get; }
-
-        [Fact]
-        public async Task DocumentState_CreatedNew_HasEmptyText()
-        {
-            // Arrange & Act
-            var state = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader);
-            
-            // Assert
-            var text = await state.GetTextAsync();
-            Assert.Equal(0, text.Length);
-        }
-
-        [Fact]
-        public async Task DocumentState_WithText_CreatesNewState()
-        {
-            // Arrange
-            var original = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader);
-
-            // Act
-            var state = original.WithText(Text, VersionStamp.Create());
-
-            // Assert
-            var text = await state.GetTextAsync();
-            Assert.Same(Text, text);
-        }
-
-        [Fact]
-        public async Task DocumentState_WithTextLoader_CreatesNewState()
-        {
-            // Arrange
-            var original = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader);
-
-            // Act
-            var state = original.WithTextLoader(TextLoader);
-
-            // Assert
-            var text = await state.GetTextAsync();
-            Assert.Same(Text, text);
-        }
-
-        [Fact]
-        public void DocumentState_WithConfigurationChange_CachesSnapshotText()
-        {
-            // Arrange
-            var original = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader)
-                .WithText(Text, VersionStamp.Create());
-
-            // Act
-            var state = original.WithConfigurationChange();
-
-            // Assert
-            Assert.True(state.TryGetText(out _));
-            Assert.True(state.TryGetTextVersion(out _));
-        }
-
-        [Fact]
-        public async Task DocumentState_WithConfigurationChange_CachesLoadedText()
-        {
-            // Arrange
-            var original = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader)
-                .WithTextLoader(TextLoader);
-
-            await original.GetTextAsync();
-
-            // Act
-            var state = original.WithConfigurationChange();
-
-            // Assert
-            Assert.True(state.TryGetText(out _));
-            Assert.True(state.TryGetTextVersion(out _));
-        }
-
-        [Fact]
-        public void DocumentState_WithWorkspaceProjectChange_CachesSnapshotText()
-        {
-            // Arrange
-            var original = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader)
-                .WithText(Text, VersionStamp.Create());
-
-            // Act
-            var state = original.WithWorkspaceProjectChange();
-
-            // Assert
-            Assert.True(state.TryGetText(out _));
-            Assert.True(state.TryGetTextVersion(out _));
-        }
-
-
-        [Fact]
-        public async Task DocumentState_WithWorkspaceProjectChange_CachesLoadedText()
-        {
-            // Arrange
-            var original = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader)
-                .WithTextLoader(TextLoader);
-
-            await original.GetTextAsync();
-
-            // Act
-            var state = original.WithWorkspaceProjectChange();
-
-            // Assert
-            Assert.True(state.TryGetText(out _));
-            Assert.True(state.TryGetTextVersion(out _));
-        }
-
-        [Fact]
-        public void DocumentState_WithWorkspaceProjectChange_TriesToCacheGeneratedOutput()
-        {
-            // Arrange
-            var original = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader);
-
-            GC.KeepAlive(original.GeneratedOutput);
-
-            // Act
-            var state = original.WithWorkspaceProjectChange();
-
-            // Assert
-            Assert.Same(state.GeneratedOutput.Older, original.GeneratedOutput);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/ProjectStateTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/ProjectStateTest.cs
deleted file mode 100644
index 585d5af27e56..000000000000
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/ProjectStateTest.cs
+++ /dev/null
@@ -1,585 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Text;
-using Xunit;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    public class ProjectStateTest
-    {
-        public ProjectStateTest()
-        {
-            TagHelperResolver = new TestTagHelperResolver();
-
-            HostServices = TestServices.Create(
-                new IWorkspaceService[]
-                {
-                    new TestProjectSnapshotProjectEngineFactory(),
-                },
-                new ILanguageService[]
-                {
-                    TagHelperResolver,
-                });
-
-            HostProject = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_2_0);
-            HostProjectWithConfigurationChange = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_1_0);
-
-            Workspace = TestWorkspace.Create(HostServices);
-
-            var projectId = ProjectId.CreateNewId("Test");
-            var solution = Workspace.CurrentSolution.AddProject(ProjectInfo.Create(
-                projectId,
-                VersionStamp.Default,
-                "Test",
-                "Test",
-                LanguageNames.CSharp,
-                "c:\\MyProject\\Test.csproj"));
-            WorkspaceProject = solution.GetProject(projectId);
-
-            SomeTagHelpers = new List<TagHelperDescriptor>();
-            SomeTagHelpers.Add(TagHelperDescriptorBuilder.Create("Test1", "TestAssembly").Build());
-
-            Documents = new HostDocument[]
-            {
-                new HostDocument("c:\\MyProject\\File.cshtml", "File.cshtml"),
-                new HostDocument("c:\\MyProject\\Index.cshtml", "Index.cshtml"),
-
-                // linked file
-                new HostDocument("c:\\SomeOtherProject\\Index.cshtml", "Pages\\Index.cshtml"),
-            };
-
-            Text = SourceText.From("Hello, world!");
-            TextLoader = () => Task.FromResult(TextAndVersion.Create(Text, VersionStamp.Create()));
-        }
-
-        private HostDocument[] Documents { get; }
-
-        private HostProject HostProject { get; }
-
-        private HostProject HostProjectWithConfigurationChange { get; }
-
-        private Project WorkspaceProject { get; }
-
-        private TestTagHelperResolver TagHelperResolver { get; }
-
-        private HostServices HostServices { get; }
-
-        private Workspace Workspace { get; }
-
-        private List<TagHelperDescriptor> SomeTagHelpers { get; }
-
-        private Func<Task<TextAndVersion>> TextLoader { get; }
-
-        private SourceText Text { get; }
-
-        [Fact]
-        public void ProjectState_ConstructedNew()
-        {
-            // Arrange
-             
-            // Act
-            var state = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject);
-
-            // Assert
-            Assert.Empty(state.Documents);
-            Assert.NotEqual(VersionStamp.Default, state.Version);
-        }
-
-        [Fact]
-        public void ProjectState_AddHostDocument_ToEmpty()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject);
-
-            // Act
-            var state = original.WithAddedHostDocument(Documents[0], DocumentState.EmptyLoader);
-
-            // Assert
-            Assert.NotEqual(original.Version, state.Version);
-
-            Assert.Collection(
-                state.Documents.OrderBy(kvp => kvp.Key),
-                d => Assert.Same(Documents[0], d.Value.HostDocument));
-        }
-
-        [Fact] // When we first add a document, we have no way to read the text, so it's empty.
-        public async Task ProjectState_AddHostDocument_DocumentIsEmpty()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject);
-
-            // Act
-            var state = original.WithAddedHostDocument(Documents[0], DocumentState.EmptyLoader);
-
-            // Assert
-            var text = await state.Documents[Documents[0].FilePath].GetTextAsync();
-            Assert.Equal(0, text.Length);
-        }
-
-        [Fact]
-        public void ProjectState_AddHostDocument_ToProjectWithDocuments()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Act
-            var state = original.WithAddedHostDocument(Documents[0], DocumentState.EmptyLoader);
-
-            // Assert
-            Assert.NotEqual(original.Version, state.Version);
-
-            Assert.Collection(
-                state.Documents.OrderBy(kvp => kvp.Key),
-                d => Assert.Same(Documents[0], d.Value.HostDocument),
-                d => Assert.Same(Documents[1], d.Value.HostDocument),
-                d => Assert.Same(Documents[2], d.Value.HostDocument));
-        }
-
-        [Fact]
-        public void ProjectState_AddHostDocument_RetainsComputedState()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
-
-            // Act
-            var state = original.WithAddedHostDocument(Documents[0], DocumentState.EmptyLoader);
-
-            // Assert
-            Assert.Same(original.ProjectEngine, state.ProjectEngine);
-            Assert.Same(original.TagHelpers, state.TagHelpers);
-
-            Assert.Same(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
-            Assert.Same(original.Documents[Documents[2].FilePath], state.Documents[Documents[2].FilePath]);
-        }
-
-        [Fact]
-        public void ProjectState_AddHostDocument_DuplicateNoops()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Act
-            var state = original.WithAddedHostDocument(new HostDocument(Documents[1].FilePath, "SomePath.cshtml"), DocumentState.EmptyLoader);
-
-            // Assert
-            Assert.Same(original, state);
-        }
-
-        [Fact]
-        public async Task ProjectState_WithChangedHostDocument_Loader()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Act
-            var state = original.WithChangedHostDocument(Documents[1], TextLoader);
-
-            // Assert
-            Assert.NotEqual(original.Version, state.Version);
-
-            var text = await state.Documents[Documents[1].FilePath].GetTextAsync();
-            Assert.Same(Text, text);
-        }
-
-        [Fact]
-        public async Task ProjectState_WithChangedHostDocument_Snapshot()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Act
-            var state = original.WithChangedHostDocument(Documents[1], Text, VersionStamp.Create());
-
-            // Assert
-            Assert.NotEqual(original.Version, state.Version);
-
-            var text = await state.Documents[Documents[1].FilePath].GetTextAsync();
-            Assert.Same(Text, text);
-        }
-
-        [Fact]
-        public void ProjectState_WithChangedHostDocument_Loader_RetainsComputedState()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
-
-            // Act
-            var state = original.WithChangedHostDocument(Documents[1], TextLoader);
-
-            // Assert
-            Assert.Same(original.ProjectEngine, state.ProjectEngine);
-            Assert.Same(original.TagHelpers, state.TagHelpers);
-
-            Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
-        }
-
-        [Fact]
-        public void ProjectState_WithChangedHostDocument_Snapshot_RetainsComputedState()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
-
-            // Act
-            var state = original.WithChangedHostDocument(Documents[1], Text, VersionStamp.Create());
-
-            // Assert
-            Assert.Same(original.ProjectEngine, state.ProjectEngine);
-            Assert.Same(original.TagHelpers, state.TagHelpers);
-
-            Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
-        }
-
-        [Fact]
-        public void ProjectState_WithChangedHostDocument_Loader_NotFoundNoops()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Act
-            var state = original.WithChangedHostDocument(Documents[0], TextLoader);
-
-            // Assert
-            Assert.Same(original, state);
-        }
-
-        [Fact]
-        public void ProjectState_WithChangedHostDocument_Snapshot_NotFoundNoops()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Act
-            var state = original.WithChangedHostDocument(Documents[0], Text, VersionStamp.Create());
-
-            // Assert
-            Assert.Same(original, state);
-        }
-
-        [Fact]
-        public void ProjectState_RemoveHostDocument_FromProjectWithDocuments()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Act
-            var state = original.WithRemovedHostDocument(Documents[1]);
-
-            // Assert
-            Assert.NotEqual(original.Version, state.Version);
-
-            Assert.Collection(
-                state.Documents.OrderBy(kvp => kvp.Key),
-                d => Assert.Same(Documents[2], d.Value.HostDocument));
-        }
-
-        [Fact]
-        public void ProjectState_RemoveHostDocument_RetainsComputedState()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
-
-            // Act
-            var state = original.WithRemovedHostDocument(Documents[2]);
-
-            // Assert
-            Assert.Same(original.ProjectEngine, state.ProjectEngine);
-            Assert.Same(original.TagHelpers, state.TagHelpers);
-
-            Assert.Same(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
-        }
-
-        [Fact]
-        public void ProjectState_RemoveHostDocument_NotFoundNoops()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Act
-            var state = original.WithRemovedHostDocument(Documents[0]);
-
-            // Assert
-            Assert.Same(original, state);
-        }
-
-        [Fact]
-        public void ProjectState_WithHostProject_ConfigurationChange_UpdatesComputedState()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
-
-            // Act
-            var state = original.WithHostProject(HostProjectWithConfigurationChange);
-
-            // Assert
-            Assert.NotEqual(original.Version, state.Version);
-            Assert.Same(HostProjectWithConfigurationChange, state.HostProject);
-
-            Assert.NotSame(original.ProjectEngine, state.ProjectEngine);
-            Assert.NotSame(original.TagHelpers, state.TagHelpers);
-
-            Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
-            Assert.NotSame(original.Documents[Documents[2].FilePath], state.Documents[Documents[2].FilePath]);
-        }
-
-        [Fact]
-        public void ProjectState_WithHostProject_NoConfigurationChange_Noops()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
-
-            // Act
-            var state = original.WithHostProject(HostProject);
-
-            // Assert
-            Assert.Same(original, state);
-        }
-
-        [Fact]
-        public void ProjectState_WithHostProject_CallsConfigurationChangeOnDocumentState()
-        {
-            // Arrange
-            var callCount = 0;
-
-            var documents = new Dictionary<string, DocumentState>();
-            documents[Documents[1].FilePath] = TestDocumentState.Create(Workspace.Services, Documents[1], onConfigurationChange: () => callCount++);
-            documents[Documents[2].FilePath] = TestDocumentState.Create(Workspace.Services, Documents[2], onConfigurationChange: () => callCount++);
-
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject);
-            original.Documents = documents;
-
-            var changed = WorkspaceProject.WithAssemblyName("Test1");
-
-            // Act
-            var state = original.WithHostProject(HostProjectWithConfigurationChange);
-
-            // Assert
-            Assert.NotEqual(original.Version, state.Version);
-            Assert.Same(HostProjectWithConfigurationChange, state.HostProject);
-            Assert.Equal(2, callCount);
-        }
-
-        [Fact]
-        public void ProjectState_WithWorkspaceProject_Removed()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
-
-            // Act
-            var state = original.WithWorkspaceProject(null);
-
-            // Assert
-            Assert.NotEqual(original.Version, state.Version);
-            Assert.Null(state.WorkspaceProject);
-
-            Assert.Same(original.ProjectEngine, state.ProjectEngine);
-            Assert.NotSame(original.TagHelpers, state.TagHelpers);
-
-            Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
-            Assert.NotSame(original.Documents[Documents[2].FilePath], state.Documents[Documents[2].FilePath]);
-        }
-
-        [Fact]
-        public void ProjectState_WithWorkspaceProject_Added()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, null)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
-
-            // Act
-            var state = original.WithWorkspaceProject(WorkspaceProject);
-
-            // Assert
-            Assert.NotEqual(original.Version, state.Version);
-            Assert.Same(WorkspaceProject, state.WorkspaceProject);
-
-            Assert.Same(original.ProjectEngine, state.ProjectEngine);
-            Assert.NotSame(original.TagHelpers, state.TagHelpers);
-
-            Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
-            Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
-        }
-
-        [Fact]
-        public void ProjectState_WithWorkspaceProject_Changed()
-        {
-            // Arrange
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
-                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
-                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
-
-            // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
-
-            var changed = WorkspaceProject.WithAssemblyName("Test1");
-
-            // Act
-            var state = original.WithWorkspaceProject(changed);
-
-            // Assert
-            Assert.NotEqual(original.Version, state.Version);
-            Assert.Same(changed, state.WorkspaceProject);
-
-            Assert.Same(original.ProjectEngine, state.ProjectEngine);
-            Assert.NotSame(original.TagHelpers, state.TagHelpers);
-
-            Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
-            Assert.NotSame(original.Documents[Documents[2].FilePath], state.Documents[Documents[2].FilePath]);
-        }
-
-        [Fact]
-        public void ProjectState_WithWorkspaceProject_CallsWorkspaceProjectChangeOnDocumentState()
-        {
-            // Arrange
-            var callCount = 0;
-
-            var documents = new Dictionary<string, DocumentState>();
-            documents[Documents[1].FilePath] = TestDocumentState.Create(Workspace.Services, Documents[1], onWorkspaceProjectChange: () => callCount++);
-            documents[Documents[2].FilePath] = TestDocumentState.Create(Workspace.Services, Documents[2], onWorkspaceProjectChange: () => callCount++);
-
-            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject);
-            original.Documents = documents;
-
-            var changed = WorkspaceProject.WithAssemblyName("Test1");
-
-            // Act
-            var state = original.WithWorkspaceProject(changed);
-
-            // Assert
-            Assert.NotEqual(original.Version, state.Version);
-            Assert.Equal(2, callCount);
-        }
-
-        private class TestDocumentState : DocumentState
-        {
-            public static TestDocumentState Create(
-                HostWorkspaceServices services,
-                HostDocument hostDocument,
-                Func<Task<TextAndVersion>> loader = null,
-                Action onTextChange = null,
-                Action onTextLoaderChange = null,
-                Action onConfigurationChange = null,
-                Action onWorkspaceProjectChange = null)
-            {
-                return new TestDocumentState(services, hostDocument, null, null, loader, onTextChange, onTextLoaderChange, onConfigurationChange, onWorkspaceProjectChange);
-            }
-
-            Action _onTextChange;
-            Action _onTextLoaderChange;
-            Action _onConfigurationChange;
-            Action _onWorkspaceProjectChange;
-
-            private TestDocumentState(
-                HostWorkspaceServices services,
-                HostDocument hostDocument,
-                SourceText text,
-                VersionStamp? version,
-                Func<Task<TextAndVersion>> loader,
-                Action onTextChange,
-                Action onTextLoaderChange,
-                Action onConfigurationChange,
-                Action onWorkspaceProjectChange)
-                : base(services, hostDocument, text, version, loader)
-            {
-                _onTextChange = onTextChange;
-                _onTextLoaderChange = onTextLoaderChange;
-                _onConfigurationChange = onConfigurationChange;
-                _onWorkspaceProjectChange = onWorkspaceProjectChange;
-            }
-
-            public override DocumentState WithText(SourceText sourceText, VersionStamp version)
-            {
-                _onTextChange?.Invoke();
-                return base.WithText(sourceText, version);
-            }
-
-            public override DocumentState WithTextLoader(Func<Task<TextAndVersion>> loader)
-            {
-                _onTextLoaderChange?.Invoke();
-                return base.WithTextLoader(loader);
-            }
-
-            public override DocumentState WithConfigurationChange()
-            {
-                _onConfigurationChange?.Invoke();
-                return base.WithConfigurationChange();
-            }
-
-            public override DocumentState WithWorkspaceProjectChange()
-            {
-                _onWorkspaceProjectChange?.Invoke();
-                return base.WithWorkspaceProjectChange();
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestProjectSnapshotManager.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestProjectSnapshotManager.cs
deleted file mode 100644
index d3e7850411e5..000000000000
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestProjectSnapshotManager.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Linq;
-using Moq;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class TestProjectSnapshotManager : DefaultProjectSnapshotManager
-    {
-        public TestProjectSnapshotManager(Workspace workspace)
-            : base(Mock.Of<ForegroundDispatcher>(), Mock.Of<ErrorReporter>(), Enumerable.Empty<ProjectSnapshotChangeTrigger>(), workspace)
-        {
-        }
-
-        public TestProjectSnapshotManager(ForegroundDispatcher foregroundDispatcher, Workspace workspace)
-            : base(foregroundDispatcher, Mock.Of<ErrorReporter>(), Enumerable.Empty<ProjectSnapshotChangeTrigger>(), workspace)
-        {
-        }
-
-        public bool AllowNotifyListeners { get; set; }
-
-        public DefaultProjectSnapshot GetSnapshot(HostProject hostProject)
-        {
-            return Projects.Cast<DefaultProjectSnapshot>().FirstOrDefault(s => s.FilePath == hostProject.FilePath);
-        }
-
-        public DefaultProjectSnapshot GetSnapshot(Project workspaceProject)
-        {
-            return Projects.Cast<DefaultProjectSnapshot>().FirstOrDefault(s => s.FilePath == workspaceProject.FilePath);
-        }
-
-        protected override void NotifyListeners(ProjectChangeEventArgs e)
-        {
-            if (AllowNotifyListeners)
-            {
-                base.NotifyListeners(e);
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestProjectSnapshotProjectEngineFactory.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestProjectSnapshotProjectEngineFactory.cs
deleted file mode 100644
index fcbb5fbc3a4c..000000000000
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestProjectSnapshotProjectEngineFactory.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class TestProjectSnapshotProjectEngineFactory : ProjectSnapshotProjectEngineFactory
-    {
-        public RazorProjectEngine Engine { get; set; }
-
-        public override RazorProjectEngine Create(ProjectSnapshot project, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
-        {
-            return Engine ?? RazorProjectEngine.Create(project.Configuration, fileSystem, configure);
-        }
-
-        public override IProjectEngineFactory FindFactory(ProjectSnapshot project)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override IProjectEngineFactory FindSerializableFactory(ProjectSnapshot project)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestTagHelperResolver.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestTagHelperResolver.cs
deleted file mode 100644
index bc623a71636e..000000000000
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestTagHelperResolver.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    internal class TestTagHelperResolver : TagHelperResolver
-    {
-        public TaskCompletionSource<TagHelperResolutionResult> CompletionSource { get; set; }
-
-        public IList<TagHelperDescriptor> TagHelpers { get; } = new List<TagHelperDescriptor>();
-
-        public override Task<TagHelperResolutionResult> GetTagHelpersAsync(ProjectSnapshot project, CancellationToken cancellationToken = default)
-        {
-            if (CompletionSource == null)
-            {
-                return Task.FromResult(new TagHelperResolutionResult(TagHelpers.ToArray(), Array.Empty<RazorDiagnostic>()));
-            }
-            else
-            {
-                return CompletionSource.Task;
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/xunit.runner.json b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/xunit.runner.json
deleted file mode 100644
index c04bb61fe68c..000000000000
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/xunit.runner.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "methodDisplay": "method",
-  "shadowCopy": false
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj
deleted file mode 100644
index 18327289a457..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net46</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Editor.Razor\Microsoft.VisualStudio.Editor.Razor.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Properties/AssemblyInfo.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Properties/AssemblyInfo.cs
deleted file mode 100644
index e3c5250b7623..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/StringTextImage.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/StringTextImage.cs
deleted file mode 100644
index 3c88701e24a3..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/StringTextImage.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.IO;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Microsoft.VisualStudio.Text
-{
-    public class StringTextImage : ITextImage
-    {
-        private readonly SourceText _sourceText;
-        private readonly string _text;
-
-        public StringTextImage(string text)
-        {
-            _text = text;
-            _sourceText = SourceText.From(text);
-        }
-
-        public char this[int position] => _text[position];
-
-        public ITextImageVersion Version => null;
-
-        public int Length => _text.Length;
-
-        public int LineCount => _sourceText.Lines.Count;
-
-        public void CopyTo(int sourceIndex, char[] destination, int destinationIndex, int count)
-        {
-            _text.CopyTo(sourceIndex, destination, destinationIndex, count);
-        }
-
-        public TextImageLine GetLineFromLineNumber(int lineNumber)
-        {
-            var line = _sourceText.Lines[lineNumber];
-            return new TextImageLine(this, lineNumber, new Span(line.Start, line.End - line.Start), line.EndIncludingLineBreak - line.End);
-        }
-
-        public TextImageLine GetLineFromPosition(int position)
-        {
-            var line = _sourceText.Lines.GetLineFromPosition(position);
-            return new TextImageLine(this, line.LineNumber, new Span(line.Start, line.End - line.Start), line.EndIncludingLineBreak - line.End);
-        }
-
-        public int GetLineNumberFromPosition(int position)
-        {
-            return _sourceText.Lines.GetLineFromPosition(position).LineNumber;
-        }
-
-        public ITextImage GetSubText(Span span)
-        {
-            return new StringTextImage(_text.Substring(span.Start, span.Length));
-        }
-
-        public string GetText(Span span)
-        {
-            return _text.Substring(span.Start, span.Length);
-        }
-
-        public char[] ToCharArray(int startIndex, int length)
-        {
-            return _text.ToCharArray(startIndex, length);
-        }
-
-        public void Write(TextWriter writer, Span span)
-        {
-            writer.Write(_text.Substring(span.Start, span.Length));
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/StringTextSnapshot.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/StringTextSnapshot.cs
deleted file mode 100644
index 7e8684bd6e61..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/StringTextSnapshot.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Microsoft.VisualStudio.Utilities;
-
-namespace Microsoft.VisualStudio.Text
-{
-    public class StringTextSnapshot : ITextSnapshot2
-    {
-        private readonly List<ITextSnapshotLine> _lines;
-
-        public StringTextSnapshot(string content)
-        {
-            Content = content;
-            _lines = new List<ITextSnapshotLine>();
-
-            var start = 0;
-            var delimiterIndex = 0;
-            while (delimiterIndex != -1)
-            {
-                var delimiterLength = 2;
-                delimiterIndex = Content.IndexOf("\r\n", start);
-
-                if (delimiterIndex == -1)
-                {
-                    delimiterLength = 1;
-                    delimiterIndex = Content.IndexOfAny(ParserHelpers.NewLineCharacters, start);
-                }
-
-                var nextLineStartIndex = delimiterIndex != -1 ? delimiterIndex + delimiterLength : Content.Length;
-
-                var lineText = Content.Substring(start, nextLineStartIndex - start);
-                _lines.Add(new SnapshotLine(lineText, start, this));
-
-                start = nextLineStartIndex;
-            }
-        }
-
-        public string Content { get; }
-
-        public char this[int position] => Content[position];
-
-        public ITextVersion Version { get; } = new TextVersion();
-
-        public int Length => Content.Length;
-
-        public ITextBuffer TextBuffer { get; set; }
-
-        public IContentType ContentType => throw new NotImplementedException();
-
-        public int LineCount => throw new NotImplementedException();
-
-        public IEnumerable<ITextSnapshotLine> Lines => throw new NotImplementedException();
-
-        public ITextImage TextImage => new StringTextImage(Content);
-
-        public void CopyTo(int sourceIndex, char[] destination, int destinationIndex, int count) => Content.CopyTo(sourceIndex, destination, destinationIndex, count);
-
-        public string GetText(int startIndex, int length) => Content.Substring(startIndex, length);
-
-        public string GetText() => Content;
-
-        public char[] ToCharArray(int startIndex, int length) => Content.ToCharArray();
-
-        public ITextSnapshotLine GetLineFromPosition(int position)
-        {
-            var matchingLine = _lines.FirstOrDefault(line => line.Start + line.LengthIncludingLineBreak > position);
-
-            if (position < 0 || matchingLine == null)
-            {
-                throw new ArgumentOutOfRangeException();
-            }
-
-            return matchingLine;
-        }
-
-        public ITextSnapshotLine GetLineFromLineNumber(int lineNumber)
-        {
-            if (lineNumber < 0 || lineNumber >= _lines.Count)
-            {
-                throw new ArgumentOutOfRangeException(nameof(lineNumber));
-            }
-
-            return _lines[lineNumber];
-        }
-
-        public ITrackingPoint CreateTrackingPoint(int position, PointTrackingMode trackingMode)
-        {
-            return new SnapshotTrackingPoint(position);
-        }
-
-        public ITrackingPoint CreateTrackingPoint(int position, PointTrackingMode trackingMode, TrackingFidelityMode trackingFidelity) => throw new NotImplementedException();
-
-        public ITrackingSpan CreateTrackingSpan(VisualStudio.Text.Span span, SpanTrackingMode trackingMode) => throw new NotImplementedException();
-
-        public ITrackingSpan CreateTrackingSpan(VisualStudio.Text.Span span, SpanTrackingMode trackingMode, TrackingFidelityMode trackingFidelity) => throw new NotImplementedException();
-
-        public ITrackingSpan CreateTrackingSpan(int start, int length, SpanTrackingMode trackingMode) => throw new NotImplementedException();
-
-        public ITrackingSpan CreateTrackingSpan(int start, int length, SpanTrackingMode trackingMode, TrackingFidelityMode trackingFidelity) => throw new NotImplementedException();
-
-        public int GetLineNumberFromPosition(int position) => throw new NotImplementedException();
-
-        public string GetText(VisualStudio.Text.Span span) => throw new NotImplementedException();
-
-        public void Write(TextWriter writer, VisualStudio.Text.Span span) => throw new NotImplementedException();
-
-        public void Write(TextWriter writer) => throw new NotImplementedException();
-
-        public void SaveToFile(string filePath, bool replaceFile, Encoding encoding)
-        {
-            throw new NotImplementedException();
-        }
-
-        private class TextVersion : ITextVersion
-        {
-            public INormalizedTextChangeCollection Changes { get; } = new TextChangeCollection();
-
-            public ITextVersion Next => throw new NotImplementedException();
-
-            public int Length => throw new NotImplementedException();
-
-            public ITextBuffer TextBuffer => throw new NotImplementedException();
-
-            public int VersionNumber => throw new NotImplementedException();
-
-            public int ReiteratedVersionNumber => throw new NotImplementedException();
-
-            public ITrackingSpan CreateCustomTrackingSpan(VisualStudio.Text.Span span, TrackingFidelityMode trackingFidelity, object customState, CustomTrackToVersion behavior) => throw new NotImplementedException();
-
-            public ITrackingPoint CreateTrackingPoint(int position, PointTrackingMode trackingMode) => throw new NotImplementedException();
-
-            public ITrackingPoint CreateTrackingPoint(int position, PointTrackingMode trackingMode, TrackingFidelityMode trackingFidelity) => throw new NotImplementedException();
-
-            public ITrackingSpan CreateTrackingSpan(VisualStudio.Text.Span span, SpanTrackingMode trackingMode) => throw new NotImplementedException();
-
-            public ITrackingSpan CreateTrackingSpan(VisualStudio.Text.Span span, SpanTrackingMode trackingMode, TrackingFidelityMode trackingFidelity) => throw new NotImplementedException();
-
-            public ITrackingSpan CreateTrackingSpan(int start, int length, SpanTrackingMode trackingMode) => throw new NotImplementedException();
-
-            public ITrackingSpan CreateTrackingSpan(int start, int length, SpanTrackingMode trackingMode, TrackingFidelityMode trackingFidelity) => throw new NotImplementedException();
-
-            private class TextChangeCollection : List<ITextChange>, INormalizedTextChangeCollection
-            {
-                public bool IncludesLineChanges => false;
-            }
-        }
-
-        private class SnapshotTrackingPoint : ITrackingPoint
-        {
-            private readonly int _position;
-
-            public SnapshotTrackingPoint(int position)
-            {
-                _position = position;
-            }
-
-            public ITextBuffer TextBuffer => throw new NotImplementedException();
-
-            public PointTrackingMode TrackingMode => throw new NotImplementedException();
-
-            public TrackingFidelityMode TrackingFidelity => throw new NotImplementedException();
-
-            public char GetCharacter(ITextSnapshot snapshot) => throw new NotImplementedException();
-
-            public SnapshotPoint GetPoint(ITextSnapshot snapshot) => throw new NotImplementedException();
-
-            public int GetPosition(ITextSnapshot snapshot) => _position;
-
-            public int GetPosition(ITextVersion version) => throw new NotImplementedException();
-        }
-
-        private class SnapshotLine : ITextSnapshotLine
-        {
-            private readonly string _contentWithLineBreak;
-            private readonly string _content;
-
-            public SnapshotLine(string contentWithLineBreak, int start, ITextSnapshot owner)
-            {
-                _contentWithLineBreak = contentWithLineBreak;
-                _content = contentWithLineBreak;
-
-                if (_content.EndsWith("\r\n"))
-                {
-                    _content = _content.Substring(0, _content.Length - 2);
-                }
-                else if(_content.Length > 0 && ParserHelpers.NewLineCharacters.Contains(_content[_content.Length - 1]))
-                {
-                    _content = _content.Substring(0, _content.Length - 1);
-                }
-
-                Start = new SnapshotPoint(owner, start);
-                End = new SnapshotPoint(owner, start + _content.Length);
-                Snapshot = owner;
-                LineNumber = (owner as StringTextSnapshot)._lines.Count;
-            }
-
-            public ITextSnapshot Snapshot { get; }
-
-            public SnapshotPoint Start { get; }
-
-            public int Length => _content.Length;
-
-            public int LengthIncludingLineBreak => _contentWithLineBreak.Length;
-
-            public int LineBreakLength => _contentWithLineBreak.Length - _content.Length;
-
-            public string GetText() => _content;
-
-            public string GetLineBreakText() => _contentWithLineBreak.Substring(_content.Length);
-
-            public string GetTextIncludingLineBreak() => _contentWithLineBreak;
-
-            public int LineNumber { get; }
-
-            public SnapshotPoint End { get; }
-
-            public SnapshotSpan Extent => throw new NotImplementedException();
-
-            public SnapshotSpan ExtentIncludingLineBreak => throw new NotImplementedException();
-
-            public SnapshotPoint EndIncludingLineBreak => throw new NotImplementedException();
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundDispatcherTestBase.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundDispatcherTestBase.cs
deleted file mode 100644
index 0bcbb7b69786..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundDispatcherTestBase.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Razor;
-
-namespace Xunit
-{
-    public abstract class ForegroundDispatcherTestBase
-    {
-        internal ForegroundDispatcher Dispatcher { get; } = new SingleThreadedForegroundDispatcher();
-
-        private class SingleThreadedForegroundDispatcher : ForegroundDispatcher
-        {
-            public SingleThreadedForegroundDispatcher()
-            {
-                ForegroundScheduler = SynchronizationContext.Current == null ? new ThrowingTaskScheduler() : TaskScheduler.FromCurrentSynchronizationContext();
-                BackgroundScheduler = TaskScheduler.Default;
-            }
-
-            public override TaskScheduler ForegroundScheduler { get; }
-
-            public override TaskScheduler BackgroundScheduler { get; }
-
-            private Thread Thread { get; } = Thread.CurrentThread;
-
-            public override bool IsForegroundThread => Thread.CurrentThread == Thread;
-        }
-
-        private class ThrowingTaskScheduler : TaskScheduler
-        {
-            protected override IEnumerable<Task> GetScheduledTasks()
-            {
-                return Enumerable.Empty<Task>();
-            }
-
-            protected override void QueueTask(Task task)
-            {
-                throw new InvalidOperationException($"Use [{nameof(ForegroundFactAttribute)}]");
-            }
-
-            protected override bool TryExecuteTaskInline(Task task, bool taskWasPreviouslyQueued)
-            {
-                throw new InvalidOperationException($"Use [{nameof(ForegroundFactAttribute)}]");
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundFactAttribute.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundFactAttribute.cs
deleted file mode 100644
index 1e09fb01f648..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundFactAttribute.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Xunit.Sdk;
-
-namespace Xunit
-{
-    // Similar to WpfFactAttribute https://github.com/xunit/samples.xunit/blob/969d9f7e887836f01a6c525324bf3db55658c28f/STAExamples/WpfFactAttribute.cs
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    [XunitTestCaseDiscoverer("Xunit." + nameof(ForegroundFactDiscoverer), "Microsoft.VisualStudio.Editor.Razor.Test.Common")]
-    internal class ForegroundFactAttribute : FactAttribute
-    {
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundFactDiscoverer.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundFactDiscoverer.cs
deleted file mode 100644
index 9551fd13e9ea..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundFactDiscoverer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Linq;
-using Xunit.Abstractions;
-using Xunit.Sdk;
-
-namespace Xunit
-{
-    internal class ForegroundFactDiscoverer : IXunitTestCaseDiscoverer
-    {
-        private readonly FactDiscoverer _inner;
-
-        public ForegroundFactDiscoverer(IMessageSink diagnosticMessageSink)
-        {
-            _inner = new FactDiscoverer(diagnosticMessageSink);
-        }
-
-        public IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute)
-        {
-            return _inner.Discover(discoveryOptions, testMethod, factAttribute).Select(t => new ForegroundFactTestCase(t));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundFactTestCase.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundFactTestCase.cs
deleted file mode 100644
index dd0bec545645..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundFactTestCase.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Threading;
-using Xunit.Abstractions;
-using Xunit.Sdk;
-
-namespace Xunit
-{
-    internal class ForegroundFactTestCase : LongLivedMarshalByRefObject, IXunitTestCase
-    {
-        private IXunitTestCase _inner;
-
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("Called by the de-serializer", error: true)]
-        public ForegroundFactTestCase()
-        {
-        }
-
-        public ForegroundFactTestCase(IXunitTestCase testCase)
-        {
-            _inner = testCase;
-        }
-
-        public string DisplayName => _inner.DisplayName;
-
-        public IMethodInfo Method => _inner.Method;
-
-        public string SkipReason => _inner.SkipReason;
-
-        public ISourceInformation SourceInformation
-        {
-            get => _inner.SourceInformation;
-            set => _inner.SourceInformation = value;
-        }
-
-        public ITestMethod TestMethod => _inner.TestMethod;
-
-        public object[] TestMethodArguments => _inner.TestMethodArguments;
-
-        public Dictionary<string, List<string>> Traits => _inner.Traits;
-
-        public string UniqueID => _inner.UniqueID;
-
-        public void Deserialize(IXunitSerializationInfo info)
-        {
-            _inner = info.GetValue<IXunitTestCase>("InnerTestCase");
-        }
-
-        public void Serialize(IXunitSerializationInfo info)
-        {
-            info.AddValue("InnerTestCase", _inner);
-        }
-
-        public Task<RunSummary> RunAsync(
-            IMessageSink diagnosticMessageSink,
-            IMessageBus messageBus,
-            object[] constructorArguments,
-            ExceptionAggregator aggregator,
-            CancellationTokenSource cancellationTokenSource)
-        {
-            var tcs = new TaskCompletionSource<RunSummary>();
-            var thread = new Thread(() =>
-            {
-                try
-                {
-                    SynchronizationContext.SetSynchronizationContext(new DispatcherSynchronizationContext());
-                    
-                    var worker = _inner.RunAsync(diagnosticMessageSink, messageBus, constructorArguments, aggregator, cancellationTokenSource);
-
-                    Exception caught = null;
-                    var frame = new DispatcherFrame();
-                    Task.Run(async () =>
-                    {
-                        try
-                        {
-                            await worker;
-                        }
-                        catch (Exception ex)
-                        {
-                            caught = ex;
-                        }
-                        finally
-                        {
-                            frame.Continue = false;
-                        }
-                    });
-
-                    Dispatcher.PushFrame(frame);
-
-                    if (caught == null)
-                    {
-                        tcs.SetResult(worker.Result);
-                    }
-                    else
-                    { 
-                        tcs.SetException(caught);
-                    }
-                }
-                catch (Exception e)
-                {
-                    tcs.SetException(e);
-                }
-            });
-
-            thread.SetApartmentState(ApartmentState.STA);
-            thread.Start();
-
-            return tcs.Task;
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundTheoryAttribute.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundTheoryAttribute.cs
deleted file mode 100644
index 2c13256d9a06..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundTheoryAttribute.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Xunit.Sdk;
-
-namespace Xunit
-{
-    // Similar to WpfTheoryAttribute https://github.com/xunit/samples.xunit/blob/969d9f7e887836f01a6c525324bf3db55658c28f/STAExamples/WpfTheoryAttribute.cs
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    [XunitTestCaseDiscoverer("Xunit.ForegroundTheoryDiscoverer", "Microsoft.VisualStudio.LanguageServices.Razor.Test")]
-    internal class ForegroundTheoryAttribute : TheoryAttribute
-    {
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundTheoryDiscoverer.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundTheoryDiscoverer.cs
deleted file mode 100644
index 7088dbb7b8d7..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundTheoryDiscoverer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Linq;
-using Xunit.Abstractions;
-using Xunit.Sdk;
-
-namespace Xunit
-{
-    internal class ForegroundTheoryDiscoverer : IXunitTestCaseDiscoverer
-    {
-        private readonly TheoryDiscoverer _inner;
-
-        public ForegroundTheoryDiscoverer(IMessageSink diagnosticMessageSink)
-        {
-            _inner = new TheoryDiscoverer(diagnosticMessageSink);
-        }
-
-        public IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute)
-        {
-            return _inner.Discover(discoveryOptions, testMethod, factAttribute).Select(t => new ForegroundFactTestCase(t));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterIntegrationTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterIntegrationTest.cs
deleted file mode 100644
index ca591d1411c8..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterIntegrationTest.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
-using Microsoft.VisualStudio.Test;
-using Microsoft.VisualStudio.Text;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class BraceSmartIndenterIntegrationTest : BraceSmartIndenterTestBase
-    {
-        [ForegroundFact]
-        public void TextBuffer_OnPostChanged_IndentsInbetweenBraces_BaseIndentation()
-        {
-            // Arrange
-            var change = Environment.NewLine;
-            var initialSnapshot = new StringTextSnapshot("@{ }");
-            var afterChangeSnapshot = new StringTextSnapshot("@{ " + change + "}");
-            var edit = new TestEdit(3, 0, initialSnapshot, change.Length, afterChangeSnapshot, change);
-            var expectedIndentResult = "@{ " + change + change + "}";
-
-            var caret = CreateCaretFrom(3 + change.Length, afterChangeSnapshot);
-            TestTextBuffer textBuffer = null;
-            var focusedTextView = CreateFocusedTextView(() => textBuffer, caret);
-            var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
-            textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
-            var codeDocumentProvider = CreateCodeDocumentProvider(initialSnapshot.Content);
-            var editorOperationsFactory = CreateOperationsFactoryService();
-            var braceSmartIndenter = new BraceSmartIndenter(Dispatcher, documentTracker, codeDocumentProvider, editorOperationsFactory);
-
-            // Act
-            textBuffer.ApplyEdit(edit);
-
-            // Assert
-            Assert.Equal(expectedIndentResult, ((StringTextSnapshot)textBuffer.CurrentSnapshot).Content);
-        }
-
-        [ForegroundFact]
-        public void TextBuffer_OnPostChanged_IndentsInbetweenBraces_OneLevelOfIndentation()
-        {
-            // Arrange
-            var change = "\r";
-            var initialSnapshot = new StringTextSnapshot("    @{ }");
-            var afterChangeSnapshot = new StringTextSnapshot("    @{ " + change + "}");
-            var edit = new TestEdit(7, 0, initialSnapshot, change.Length, afterChangeSnapshot, change);
-            var expectedIndentResult = "    @{ " + change + change + "    }";
-
-            var caret = CreateCaretFrom(7 + change.Length, afterChangeSnapshot);
-            TestTextBuffer textBuffer = null;
-            var focusedTextView = CreateFocusedTextView(() => textBuffer, caret);
-            var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
-            textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
-            var codeDocumentProvider = CreateCodeDocumentProvider(initialSnapshot.Content);
-            var editorOperationsFactory = CreateOperationsFactoryService();
-            var braceSmartIndenter = new BraceSmartIndenter(Dispatcher, documentTracker, codeDocumentProvider, editorOperationsFactory);
-
-            // Act
-            textBuffer.ApplyEdit(edit);
-
-            // Assert
-            Assert.Equal(expectedIndentResult, ((StringTextSnapshot)textBuffer.CurrentSnapshot).Content);
-        }
-
-        [ForegroundFact]
-        public void TextBuffer_OnPostChanged_IndentsInbetweenDirectiveBlockBraces()
-        {
-            // Arrange
-            var change = Environment.NewLine;
-            var initialSnapshot = new StringTextSnapshot("    @functions {}");
-            var afterChangeSnapshot = new StringTextSnapshot("    @functions {" + change + "}");
-            var edit = new TestEdit(16, 0, initialSnapshot, change.Length, afterChangeSnapshot, change);
-            var expectedIndentResult = "    @functions {" + change + change + "    }";
-
-            var caret = CreateCaretFrom(16 + change.Length, afterChangeSnapshot);
-            TestTextBuffer textBuffer = null;
-            var focusedTextView = CreateFocusedTextView(() => textBuffer, caret);
-            var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
-            textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
-            var codeDocumentProvider = CreateCodeDocumentProvider(initialSnapshot.Content);
-            var editorOperationsFactory = CreateOperationsFactoryService();
-            var braceSmartIndenter = new BraceSmartIndenter(Dispatcher, documentTracker, codeDocumentProvider, editorOperationsFactory);
-
-            // Act
-            textBuffer.ApplyEdit(edit);
-
-            // Assert
-            Assert.Equal(expectedIndentResult, ((StringTextSnapshot)textBuffer.CurrentSnapshot).Content);
-        }
-
-        [ForegroundFact]
-        public void TextBuffer_OnPostChanged_DoesNotIndentJavaScript()
-        {
-            // Arrange
-            var change = Environment.NewLine;
-            var initialSnapshot = new StringTextSnapshot("    <script>function foo() {}</script>");
-            var afterChangeSnapshot = new StringTextSnapshot("    <script>function foo() {" + change + "}</script>");
-            var edit = new TestEdit(28, 0, initialSnapshot, change.Length, afterChangeSnapshot, change);
-
-            var caret = CreateCaretFrom(28 + change.Length, afterChangeSnapshot);
-            TestTextBuffer textBuffer = null;
-            var focusedTextView = CreateFocusedTextView(() => textBuffer, caret);
-            var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
-            textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
-            var codeDocumentProvider = CreateCodeDocumentProvider(initialSnapshot.Content);
-            var editorOperationsFactory = CreateOperationsFactoryService();
-            var braceSmartIndenter = new BraceSmartIndenter(Dispatcher, documentTracker, codeDocumentProvider, editorOperationsFactory);
-
-            // Act
-            textBuffer.ApplyEdit(edit);
-
-            // Assert
-            Assert.Equal(afterChangeSnapshot.Content, ((StringTextSnapshot)textBuffer.CurrentSnapshot).Content);
-        }
-
-        private TextBufferCodeDocumentProvider CreateCodeDocumentProvider(string content)
-        {
-            var sourceDocument = TestRazorSourceDocument.Create(content);
-            var syntaxTree = RazorSyntaxTree.Parse(sourceDocument, RazorParserOptions.Create(opt => opt.Directives.Add(FunctionsDirective.Directive)));
-            var codeDocument = TestRazorCodeDocument.Create(content);
-            codeDocument.SetSyntaxTree(syntaxTree);
-            var codeDocumentProvider = Mock.Of<TextBufferCodeDocumentProvider>(provider => provider.TryGetFromBuffer(It.IsAny<ITextBuffer>(), out codeDocument));
-
-            return codeDocumentProvider;
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterTest.cs
deleted file mode 100644
index 270165997d20..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterTest.cs
+++ /dev/null
@@ -1,573 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Microsoft.VisualStudio.Test;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.Text.Operations;
-using Moq;
-using Xunit;
-using ITextBuffer = Microsoft.VisualStudio.Text.ITextBuffer;
-using Span = Microsoft.AspNetCore.Razor.Language.Legacy.Span;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
-    {
-        [Fact]
-        public void AtApplicableRazorBlock_NestedIfBlock_ReturnsFalse()
-        {
-            // Arrange
-            var syntaxTree = GetSyntaxTree("@{ if (true) { } }");
-
-            // Act
-            var result = BraceSmartIndenter.AtApplicableRazorBlock(14, syntaxTree);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void AtApplicableRazorBlock_SectionBlock_ReturnsTrue()
-        {
-            // Arrange
-            var syntaxTree = GetSyntaxTree("@section Foo { }");
-
-            // Act
-            var result = BraceSmartIndenter.AtApplicableRazorBlock(15, syntaxTree);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void AtApplicableRazorBlock_FunctionsBlock_ReturnsTrue()
-        {
-            // Arrange
-            var syntaxTree = GetSyntaxTree("@functions { }");
-
-            // Act
-            var result = BraceSmartIndenter.AtApplicableRazorBlock(13, syntaxTree);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void AtApplicableRazorBlock_ExplicitCodeBlock_ReturnsTrue()
-        {
-            // Arrange
-            var syntaxTree = GetSyntaxTree("@{ }");
-
-            // Act
-            var result = BraceSmartIndenter.AtApplicableRazorBlock(3, syntaxTree);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void ContainsInvalidContent_NewLineSpan_ReturnsFalse()
-        {
-            // Arrange
-            var span = ExtractSpan(2, "@{" + Environment.NewLine + "}");
-
-            // Act
-            var result = BraceSmartIndenter.ContainsInvalidContent(span);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void ContainsInvalidContent_WhitespaceSpan_ReturnsFalse()
-        {
-            // Arrange
-            var span = ExtractSpan(2, "@{ }");
-
-            // Act
-            var result = BraceSmartIndenter.ContainsInvalidContent(span);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void ContainsInvalidContent_MarkerSpan_ReturnsFalse()
-        {
-            // Arrange
-            var span = ExtractSpan(3, "@{}");
-
-            // Act
-            var result = BraceSmartIndenter.ContainsInvalidContent(span);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void ContainsInvalidContent_NonWhitespaceMarker_ReturnsTrue()
-        {
-            // Arrange
-            var span = ExtractSpan(2, "@{ if}");
-
-            // Act
-            var result = BraceSmartIndenter.ContainsInvalidContent(span);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void IsUnlinkedSpan_NullPrevious_ReturnsTrue()
-        {
-            // Arrange
-            var span = ExtractSpan(0, "@{}");
-
-            // Act
-            var result = BraceSmartIndenter.IsUnlinkedSpan(span);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void IsUnlinkedSpan_NullNext_ReturnsTrue()
-        {
-            // Arrange
-            var span = ExtractSpan(3, "@{}");
-
-            // Act
-            var result = BraceSmartIndenter.IsUnlinkedSpan(span);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void IsUnlinkedSpan_NullOwner_ReturnsTrue()
-        {
-            // Arrange
-            Span owner = null;
-
-            // Act
-            var result = BraceSmartIndenter.IsUnlinkedSpan(owner);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void SurroundedByInvalidContent_MetacodeSurroundings_ReturnsFalse()
-        {
-            // Arrange
-            var span = ExtractSpan(2, "@{}");
-
-            // Act
-            var result = BraceSmartIndenter.SurroundedByInvalidContent(span);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void SurroundedByInvalidContent_OnlyNextMetacode_ReturnsTrue()
-        {
-            // Arrange
-            var span = ExtractSpan(9, "@{<p></p>}");
-
-            // Act
-            var result = BraceSmartIndenter.SurroundedByInvalidContent(span);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void SurroundedByInvalidContent_OnlyPreviousMetacode_ReturnsTrue()
-        {
-            // Arrange
-            var span = ExtractSpan(2, "@{<p>");
-
-            // Act
-            var result = BraceSmartIndenter.SurroundedByInvalidContent(span);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void AtApplicableRazorBlock_AtMarkup_ReturnsFalse()
-        {
-            // Arrange
-            var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create("<p></p>"));
-            var changePosition = 2;
-
-            // Act
-            var result = BraceSmartIndenter.AtApplicableRazorBlock(changePosition, syntaxTree);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void AtApplicableRazorBlock_AtExplicitCodeBlocksCode_ReturnsTrue()
-        {
-            // Arrange
-            var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create("@{}"));
-            var changePosition = 2;
-
-            // Act
-            var result = BraceSmartIndenter.AtApplicableRazorBlock(changePosition, syntaxTree);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void AtApplicableRazorBlock_AtMetacode_ReturnsTrue()
-        {
-            // Arrange
-            var parseOptions = RazorParserOptions.Create(options => options.Directives.Add(FunctionsDirective.Directive));
-            var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create("@functions {}"), parseOptions);
-            var changePosition = 12;
-
-            // Act
-            var result = BraceSmartIndenter.AtApplicableRazorBlock(changePosition, syntaxTree);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void AtApplicableRazorBlock_WhenNoOwner_ReturnsFalse()
-        {
-            // Arrange
-            var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create("@DateTime.Now"));
-            var changePosition = 14; // 1 after the end of the content
-
-            // Act
-            var result = BraceSmartIndenter.AtApplicableRazorBlock(changePosition, syntaxTree);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void InsertIndent_InsertsProvidedIndentIntoBuffer()
-        {
-            // Arrange
-            var initialSnapshot = new StringTextSnapshot("@{ \n}");
-            var expectedIndentResult = "@{ anything\n}";
-            ITextBuffer textBuffer = null;
-            var textView = CreateFocusedTextView(() => textBuffer);
-            var documentTracker = CreateDocumentTracker(() => textBuffer, textView);
-            textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
-
-            // Act
-            BraceSmartIndenter.InsertIndent(3, "anything", textBuffer);
-
-            // Assert
-            Assert.Equal(expectedIndentResult, ((StringTextSnapshot)textBuffer.CurrentSnapshot).Content);
-        }
-
-        [Fact]
-        public void RestoreCaretTo_PlacesCursorAtProvidedPosition()
-        {
-            // Arrange
-            var initialSnapshot = new StringTextSnapshot("@{ \n\n}");
-            var bufferPosition = new VirtualSnapshotPoint(initialSnapshot, 4);
-            var caret = new Mock<ITextCaret>();
-            caret.Setup(c => c.MoveTo(It.IsAny<SnapshotPoint>()))
-                .Callback<SnapshotPoint>(point =>
-                {
-                    Assert.Equal(3, point.Position);
-                    Assert.Same(initialSnapshot, point.Snapshot);
-                });
-            ITextBuffer textBuffer = null;
-            var textView = CreateFocusedTextView(() => textBuffer, caret.Object);
-            var documentTracker = CreateDocumentTracker(() => textBuffer, textView);
-            textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
-
-            // Act
-            BraceSmartIndenter.RestoreCaretTo(3, textView);
-
-            // Assert
-            caret.VerifyAll();
-        }
-
-        [Fact]
-        public void TriggerSmartIndent_ForcesEditorToMoveToEndOfLine()
-        {
-            // Arrange
-            var textView = CreateFocusedTextView();
-            var editorOperations = new Mock<IEditorOperations>();
-            editorOperations.Setup(operations => operations.MoveToEndOfLine(false));
-            var editorOperationsFactory = new Mock<IEditorOperationsFactoryService>();
-            var documentTracker = CreateDocumentTracker(() => Mock.Of<ITextBuffer>(), textView);
-            editorOperationsFactory.Setup(factory => factory.GetEditorOperations(textView))
-                .Returns(editorOperations.Object);
-            var codeDocumentProvider = Mock.Of<TextBufferCodeDocumentProvider>();
-            var smartIndenter = new BraceSmartIndenter(Dispatcher, documentTracker, codeDocumentProvider, editorOperationsFactory.Object);
-
-            // Act
-            smartIndenter.TriggerSmartIndent(textView);
-
-            // Assert
-            editorOperations.VerifyAll();
-        }
-
-        [Fact]
-        public void AfterClosingBrace_ContentAfterBrace_ReturnsFalse()
-        {
-            // Arrange
-            var fileSnapshot = new StringTextSnapshot("@functions\n{a\n}");
-            var changePosition = 13;
-            var line = fileSnapshot.GetLineFromPosition(changePosition);
-
-            // Act & Assert
-            Assert.False(BraceSmartIndenter.BeforeClosingBrace(0, line));
-        }
-
-        [Theory]
-        [InlineData("@functions\n{\n}")]
-        [InlineData("@functions\n{   \n}")]
-        [InlineData("@functions\n  {   \n}")]
-        [InlineData("@functions\n\t\t{\t\t\n}")]
-        public void AfterClosingBrace_BraceBeforePosition_ReturnsTrue(string fileContent)
-        {
-            // Arrange
-            var fileSnapshot = new StringTextSnapshot(fileContent);
-            var changePosition = fileContent.Length - 3 /* \n} */;
-            var line = fileSnapshot.GetLineFromPosition(changePosition);
-
-            // Act & Assert
-            Assert.True(BraceSmartIndenter.AfterOpeningBrace(line.Length - 1, line));
-        }
-
-        [Fact]
-        public void BeforeClosingBrace_ContentPriorToBrace_ReturnsFalse()
-        {
-            // Arrange
-            var fileSnapshot = new StringTextSnapshot("@functions\n{\na}");
-            var changePosition = 12;
-            var line = fileSnapshot.GetLineFromPosition(changePosition + 1 /* \n */);
-
-            // Act & Assert
-            Assert.False(BraceSmartIndenter.BeforeClosingBrace(0, line));
-        }
-
-        [Theory]
-        [InlineData("@functions\n{\n}")]
-        [InlineData("@functions\n{\n   }")]
-        [InlineData("@functions\n{\n   }   ")]
-        [InlineData("@functions\n{\n\t\t   }   ")]
-        public void BeforeClosingBrace_BraceAfterPosition_ReturnsTrue(string fileContent)
-        {
-            // Arrange
-            var fileSnapshot = new StringTextSnapshot(fileContent);
-            var changePosition = 12;
-            var line = fileSnapshot.GetLineFromPosition(changePosition + 1 /* \n */);
-
-            // Act & Assert
-            Assert.True(BraceSmartIndenter.BeforeClosingBrace(0, line));
-        }
-
-        [ForegroundFact]
-        public void TextBuffer_OnChanged_NoopsIfNoChanges()
-        {
-            // Arrange
-            var editorOperationsFactory = new Mock<IEditorOperationsFactoryService>();
-            var changeCollection = new TestTextChangeCollection();
-            var textContentChangeArgs = new TestTextContentChangedEventArgs(changeCollection);
-            var documentTracker = CreateDocumentTracker(() => Mock.Of<ITextBuffer>(), Mock.Of<ITextView>());
-            var codeDocumentProvider = Mock.Of<TextBufferCodeDocumentProvider>();
-            var braceSmartIndenter = new BraceSmartIndenter(Dispatcher, documentTracker, codeDocumentProvider, editorOperationsFactory.Object);
-
-            // Act & Assert
-            braceSmartIndenter.TextBuffer_OnChanged(null, textContentChangeArgs);
-        }
-
-        [ForegroundFact]
-        public void TextBuffer_OnChanged_NoopsIfChangesThatResultInNoChange()
-        {
-            // Arrange
-            var initialSnapshot = new StringTextSnapshot("Hello World");
-            var textBuffer = new TestTextBuffer(initialSnapshot);
-            var edit = new TestEdit(0, 0, initialSnapshot, 0, initialSnapshot, string.Empty);
-            var editorOperationsFactory = new Mock<IEditorOperationsFactoryService>();
-            var documentTracker = CreateDocumentTracker(() => textBuffer, Mock.Of<ITextView>());
-            var codeDocumentProvider = Mock.Of<TextBufferCodeDocumentProvider>();
-            var braceSmartIndenter = new BraceSmartIndenter(Dispatcher, documentTracker, codeDocumentProvider, editorOperationsFactory.Object);
-
-            // Act & Assert
-            textBuffer.ApplyEdits(edit, edit);
-        }
-
-        [Fact]
-        public void TryCreateIndentationContext_ReturnsFalseIfNoFocusedTextView()
-        {
-            // Arrange
-            var snapshot = new StringTextSnapshot(Environment.NewLine + "Hello World");
-            var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create(snapshot.Content));
-            ITextBuffer textBuffer = null;
-            var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView: null);
-            textBuffer = CreateTextBuffer(snapshot, documentTracker);
-
-            // Act
-            var result = BraceSmartIndenter.TryCreateIndentationContext(0, Environment.NewLine.Length, Environment.NewLine, syntaxTree, documentTracker, out var context);
-
-            // Assert
-            Assert.Null(context);
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TryCreateIndentationContext_ReturnsFalseIfTextChangeIsNotNewline()
-        {
-            // Arrange
-            var snapshot = new StringTextSnapshot("This Hello World");
-            var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create(snapshot.Content));
-            ITextBuffer textBuffer = null;
-            var focusedTextView = CreateFocusedTextView(() => textBuffer);
-            var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
-            textBuffer = CreateTextBuffer(snapshot, documentTracker);
-
-            // Act
-            var result = BraceSmartIndenter.TryCreateIndentationContext(0, 5, "This ", syntaxTree, documentTracker, out var context);
-
-            // Assert
-            Assert.Null(context);
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TryCreateIndentationContext_ReturnsFalseIfNewLineIsNotPrecededByOpenBrace_FileStart()
-        {
-            // Arrange
-            var initialSnapshot = new StringTextSnapshot(Environment.NewLine + "Hello World");
-            var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create(initialSnapshot.Content));
-            ITextBuffer textBuffer = null;
-            var focusedTextView = CreateFocusedTextView(() => textBuffer);
-            var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
-            textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
-
-            // Act
-            var result = BraceSmartIndenter.TryCreateIndentationContext(0, Environment.NewLine.Length, Environment.NewLine, syntaxTree, documentTracker, out var context);
-
-            // Assert
-            Assert.Null(context);
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TryCreateIndentationContext_ReturnsFalseIfNewLineIsNotPrecededByOpenBrace_MidFile()
-        {
-            // Arrange
-            var initialSnapshot = new StringTextSnapshot("Hello\u0085World");
-            var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create(initialSnapshot.Content));
-            ITextBuffer textBuffer = null;
-            var focusedTextView = CreateFocusedTextView(() => textBuffer);
-            var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
-            textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
-
-            // Act
-            var result = BraceSmartIndenter.TryCreateIndentationContext(5, 1, "\u0085", syntaxTree, documentTracker, out var context);
-
-            // Assert
-            Assert.Null(context);
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TryCreateIndentationContext_ReturnsFalseIfNewLineIsNotFollowedByCloseBrace()
-        {
-            // Arrange
-            var initialSnapshot = new StringTextSnapshot("@{ " + Environment.NewLine + "World");
-            var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create(initialSnapshot.Content));
-            ITextBuffer textBuffer = null;
-            var focusedTextView = CreateFocusedTextView(() => textBuffer);
-            var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
-            textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
-
-            // Act
-            var result = BraceSmartIndenter.TryCreateIndentationContext(3, Environment.NewLine.Length, Environment.NewLine, syntaxTree, documentTracker, out var context);
-
-            // Assert
-            Assert.Null(context);
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TryCreateIndentationContext_ReturnsTrueIfNewLineIsSurroundedByBraces()
-        {
-            // Arrange
-            var initialSnapshot = new StringTextSnapshot("@{ \n}");
-            var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create(initialSnapshot.Content));
-            ITextBuffer textBuffer = null;
-            var focusedTextView = CreateFocusedTextView(() => textBuffer);
-            var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
-            textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
-
-            // Act
-            var result = BraceSmartIndenter.TryCreateIndentationContext(3, 1, "\n", syntaxTree, documentTracker, out var context);
-
-            // Assert
-            Assert.NotNull(context);
-            Assert.Same(focusedTextView, context.FocusedTextView);
-            Assert.Equal(3, context.ChangePosition);
-            Assert.True(result);
-        }
-
-        private static RazorSyntaxTree GetSyntaxTree(string content)
-        {
-            var syntaxTree = RazorSyntaxTree.Parse(
-                TestRazorSourceDocument.Create(content),
-                RazorParserOptions.Create(options =>
-                {
-                    options.Directives.Add(FunctionsDirective.Directive);
-                    options.Directives.Add(SectionDirective.Directive);
-                }));
-            syntaxTree.Root.LinkNodes();
-
-            return syntaxTree;
-        }
-
-        private static Span ExtractSpan(int spanLocation, string content)
-        {
-            var syntaxTree = GetSyntaxTree(content);
-            var span = syntaxTree.Root.LocateOwner(new SourceChange(new SourceSpan(spanLocation, 0), string.Empty));
-            return span;
-        }
-
-        protected class TestTextContentChangedEventArgs : TextContentChangedEventArgs
-        {
-            public TestTextContentChangedEventArgs(INormalizedTextChangeCollection changeCollection)
-                : base(CreateBeforeSnapshot(changeCollection), new Mock<ITextSnapshot>().Object, EditOptions.DefaultMinimalChange, null)
-            {
-            }
-
-            protected static ITextSnapshot CreateBeforeSnapshot(INormalizedTextChangeCollection collection)
-            {
-                var version = new Mock<ITextVersion>();
-                version.Setup(v => v.Changes)
-                    .Returns(collection);
-                var snapshot = new Mock<ITextSnapshot>();
-                snapshot.Setup(obj => obj.Version)
-                    .Returns(version.Object);
-
-                return snapshot.Object;
-            }
-        }
-
-        protected class TestTextChangeCollection : List<ITextChange>, INormalizedTextChangeCollection
-        {
-            public bool IncludesLineChanges => throw new NotImplementedException();
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterTestBase.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterTestBase.cs
deleted file mode 100644
index 679d2674c582..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterTestBase.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.VisualStudio.Test;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.Text.Operations;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class BraceSmartIndenterTestBase : ForegroundDispatcherTestBase
-    {
-        protected static VisualStudioDocumentTracker CreateDocumentTracker(Func<ITextBuffer> bufferAccessor, ITextView focusedTextView)
-        {
-            var tracker = new Mock<VisualStudioDocumentTracker>();
-            tracker.Setup(t => t.TextBuffer)
-                .Returns(bufferAccessor);
-            tracker.Setup(t => t.GetFocusedTextView())
-                .Returns(focusedTextView);
-
-            return tracker.Object;
-        }
-
-        protected static ITextView CreateFocusedTextView(Func<ITextBuffer> textBufferAccessor = null, ITextCaret caret = null)
-        {
-            var focusedTextView = new Mock<ITextView>();
-            focusedTextView.Setup(textView => textView.HasAggregateFocus)
-                .Returns(true);
-
-            if (textBufferAccessor != null)
-            {
-                focusedTextView.Setup(textView => textView.TextBuffer)
-                    .Returns(textBufferAccessor);
-            }
-
-            if (caret != null)
-            {
-                focusedTextView.Setup(textView => textView.Caret)
-                    .Returns(caret);
-            }
-
-            return focusedTextView.Object;
-        }
-
-        protected static ITextCaret CreateCaretFrom(int position, ITextSnapshot snapshot)
-        {
-            var bufferPosition = new VirtualSnapshotPoint(snapshot, position);
-            var caret = new Mock<ITextCaret>();
-            caret.Setup(c => c.Position)
-                .Returns(new CaretPosition(bufferPosition, new Mock<IMappingPoint>().Object, PositionAffinity.Predecessor));
-            caret.Setup(c => c.MoveTo(It.IsAny<SnapshotPoint>()));
-
-            return caret.Object;
-        }
-
-        protected static IEditorOperationsFactoryService CreateOperationsFactoryService()
-        {
-            var editorOperations = new Mock<IEditorOperations>();
-            editorOperations.Setup(operations => operations.MoveToEndOfLine(false));
-            var editorOperationsFactory = new Mock<IEditorOperationsFactoryService>();
-            editorOperationsFactory.Setup(factory => factory.GetEditorOperations(It.IsAny<ITextView>()))
-                .Returns(editorOperations.Object);
-
-            return editorOperationsFactory.Object;
-        }
-
-        protected static TestTextBuffer CreateTextBuffer(ITextSnapshot initialSnapshot, VisualStudioDocumentTracker documentTracker)
-        {
-            var textBuffer = new TestTextBuffer(initialSnapshot);
-            textBuffer.Properties.AddProperty(typeof(VisualStudioDocumentTracker), documentTracker);
-
-            return textBuffer;
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultCodeDocumentProviderTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultCodeDocumentProviderTest.cs
deleted file mode 100644
index 41e382cc0411..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultCodeDocumentProviderTest.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis;
-using Microsoft.VisualStudio.Text;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultCodeDocumentProviderTest
-    {
-        [Fact]
-        public void TryGetFromDocument_ReturnsFalseIfBufferProviderCanNotGetAssociatedBuffer()
-        {
-            // Arrange
-            ITextBuffer textBuffer;
-            RazorCodeDocument codeDocument;
-            var bufferProvider = new Mock<RazorTextBufferProvider>();
-            bufferProvider.Setup(provider => provider.TryGetFromDocument(It.IsAny<TextDocument>(), out textBuffer))
-                .Returns(false);
-            var vsCodeDocumentProvider = new Mock<TextBufferCodeDocumentProvider>();
-            vsCodeDocumentProvider.Setup(provider => provider.TryGetFromBuffer(It.IsAny<ITextBuffer>(), out codeDocument))
-                .Returns(true);
-            var codeDocumentProvider = new DefaultCodeDocumentProvider(bufferProvider.Object, vsCodeDocumentProvider.Object);
-            var document = new Mock<TextDocument>();
-
-            // Act
-            var result = codeDocumentProvider.TryGetFromDocument(document.Object, out codeDocument);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(codeDocument);
-        }
-
-        [Fact]
-        public void TryGetFromDocument_ReturnsFalseIfVSProviderCanNotGetCodeDocument()
-        {
-            // Arrange
-            var textBuffer = new Mock<ITextBuffer>().Object;
-            RazorCodeDocument codeDocument;
-            var bufferProvider = new Mock<RazorTextBufferProvider>();
-            bufferProvider.Setup(provider => provider.TryGetFromDocument(It.IsAny<TextDocument>(), out textBuffer))
-                .Returns(true);
-            var vsCodeDocumentProvider = new Mock<TextBufferCodeDocumentProvider>();
-            vsCodeDocumentProvider.Setup(provider => provider.TryGetFromBuffer(It.Is<ITextBuffer>(val => val == textBuffer), out codeDocument))
-                .Returns(false);
-            var codeDocumentProvider = new DefaultCodeDocumentProvider(bufferProvider.Object, vsCodeDocumentProvider.Object);
-            var document = new Mock<TextDocument>();
-
-            // Act
-            var result = codeDocumentProvider.TryGetFromDocument(document.Object, out codeDocument);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(codeDocument);
-        }
-
-        [Fact]
-        public void TryGetFromDocument_ReturnsTrueIfBothBufferAndVSProviderReturnTrue()
-        {
-            // Arrange
-            var textBuffer = new Mock<ITextBuffer>().Object;
-            var expectedCodeDocument = new Mock<RazorCodeDocument>().Object;
-            var bufferProvider = new Mock<RazorTextBufferProvider>();
-            bufferProvider.Setup(provider => provider.TryGetFromDocument(It.IsAny<TextDocument>(), out textBuffer))
-                .Returns(true);
-            var vsCodeDocumentProvider = new Mock<TextBufferCodeDocumentProvider>();
-            vsCodeDocumentProvider.Setup(provider => provider.TryGetFromBuffer(It.Is<ITextBuffer>(val => val == textBuffer), out expectedCodeDocument))
-                .Returns(true);
-            var codeDocumentProvider = new DefaultCodeDocumentProvider(bufferProvider.Object, vsCodeDocumentProvider.Object);
-            var document = new Mock<TextDocument>();
-
-            // Act
-            var result = codeDocumentProvider.TryGetFromDocument(document.Object, out var codeDocument);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(expectedCodeDocument, codeDocument);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultEditorSettingsManagerTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultEditorSettingsManagerTest.cs
deleted file mode 100644
index fdf27056d387..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultEditorSettingsManagerTest.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis.Razor.Editor;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultEditorSettingsManagerTest : ForegroundDispatcherTestBase
-    {
-        [Fact]
-        public void InitialSettingsAreDefault()
-        {
-            // Act
-            var manager = new DefaultEditorSettingsManager(Dispatcher);
-
-            // Assert
-            Assert.Equal(EditorSettings.Default, manager.Current);
-        }
-
-        [Fact]
-        public void Update_TriggersChangedIfEditorSettingsAreDifferent()
-        {
-            // Arrange
-            var manager = new DefaultEditorSettingsManager(Dispatcher);
-            var called = false;
-            manager.Changed += (caller, args) =>
-            {
-                called = true;
-            };
-            var settings = new EditorSettings(indentWithTabs: true, indentSize: 7);
-
-            // Act
-            manager.Update(settings);
-
-            // Assert
-            Assert.True(called);
-            Assert.Equal(settings, manager.Current);
-        }
-
-        [Fact]
-        public void Update_DoesNotTriggerChangedIfEditorSettingsAreSame()
-        {
-            // Arrange
-            var manager = new DefaultEditorSettingsManager(Dispatcher);
-            var called = false;
-            manager.Changed += (caller, args) =>
-            {
-                called = true;
-            };
-            var originalSettings = manager.Current;
-
-            // Act
-            manager.Update(EditorSettings.Default);
-
-            // Assert
-            Assert.False(called);
-            Assert.Same(originalSettings, manager.Current);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultImportDocumentManagerIntegrationTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultImportDocumentManagerIntegrationTest.cs
deleted file mode 100644
index 9fd3cf04eade..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultImportDocumentManagerIntegrationTest.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.IO;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    public class DefaultImportDocumentManagerIntegrationTest : ForegroundDispatcherTestBase
-    {
-        public DefaultImportDocumentManagerIntegrationTest()
-        {
-            ProjectPath = "C:\\path\\to\\project\\project.csproj";
-
-            FileSystem = RazorProjectFileSystem.Create(Path.GetDirectoryName(ProjectPath));
-            ProjectEngine = RazorProjectEngine.Create(FallbackRazorConfiguration.MVC_2_1, FileSystem, b =>
-            {
-                // These tests rely on MVC's import behavior.
-                Microsoft.AspNetCore.Mvc.Razor.Extensions.RazorExtensions.Register(b);
-            });
-        }
-
-        private string FilePath { get; }
-
-        private string ProjectPath { get; }
-
-        private RazorProjectFileSystem FileSystem { get; }
-
-        private RazorProjectEngine ProjectEngine { get; }
-
-        [ForegroundFact]
-        public void Changed_TrackerChanged_ResultsInChangedHavingCorrectArgs()
-        {
-            // Arrange
-            var testImportsPath = "C:\\path\\to\\project\\_ViewImports.cshtml";
-
-            var tracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\Views\\Home\\file.cshtml" &&
-                t.ProjectPath == ProjectPath &&
-                t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
-
-            var anotherTracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\anotherFile.cshtml" &&
-                t.ProjectPath == ProjectPath &&
-                t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
-
-            var fileChangeTrackerFactory = new Mock<FileChangeTrackerFactory>();
-            var fileChangeTracker = new Mock<FileChangeTracker>();
-            fileChangeTracker
-                .Setup(f => f.FilePath)
-                .Returns(testImportsPath);
-            fileChangeTrackerFactory
-                .Setup(f => f.Create(testImportsPath))
-                .Returns(fileChangeTracker.Object);
-
-            fileChangeTrackerFactory
-                .Setup(f => f.Create("C:\\path\\to\\project\\Views\\_ViewImports.cshtml"))
-                .Returns(Mock.Of<FileChangeTracker>());
-            fileChangeTrackerFactory
-                .Setup(f => f.Create("C:\\path\\to\\project\\Views\\Home\\_ViewImports.cshtml"))
-                .Returns(Mock.Of<FileChangeTracker>());
-
-            var called = false;
-            var manager = new DefaultImportDocumentManager(Dispatcher, new DefaultErrorReporter(), fileChangeTrackerFactory.Object);
-            manager.OnSubscribed(tracker);
-            manager.OnSubscribed(anotherTracker);
-            manager.Changed += (sender, args) =>
-            {
-                called = true;
-                Assert.Same(sender, manager);
-                Assert.Equal(testImportsPath, args.FilePath);
-                Assert.Equal(FileChangeKind.Changed, args.Kind);
-                Assert.Collection(
-                    args.AssociatedDocuments,
-                    f => Assert.Equal("C:\\path\\to\\project\\Views\\Home\\file.cshtml", f),
-                    f => Assert.Equal("C:\\path\\to\\project\\anotherFile.cshtml", f));
-            };
-
-            // Act
-            fileChangeTracker.Raise(t => t.Changed += null, new FileChangeEventArgs(testImportsPath, FileChangeKind.Changed));
-
-            // Assert
-            Assert.True(called);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultImportDocumentManagerTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultImportDocumentManagerTest.cs
deleted file mode 100644
index a84a26fb04c2..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultImportDocumentManagerTest.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Editor.Razor.Documents;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultImportDocumentManagerTest : ForegroundDispatcherTestBase
-    {
-        public DefaultImportDocumentManagerTest()
-        {
-            ProjectPath = "C:\\path\\to\\project\\project.csproj";
-
-            FileSystem = RazorProjectFileSystem.Create(Path.GetDirectoryName(ProjectPath));
-            ProjectEngine = RazorProjectEngine.Create(FallbackRazorConfiguration.MVC_2_1, FileSystem, b =>
-            {
-                // These tests rely on MVC's import behavior.
-                Microsoft.AspNetCore.Mvc.Razor.Extensions.RazorExtensions.Register(b);
-            });
-        }
-
-        private string FilePath { get; }
-
-        private string ProjectPath { get; }
-
-        private RazorProjectFileSystem FileSystem { get; }
-
-        private RazorProjectEngine ProjectEngine { get; }
-
-        [ForegroundFact]
-        public void OnSubscribed_StartsFileChangeTrackers()
-        {
-            // Arrange
-            var tracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\Views\\Home\\file.cshtml" && 
-                t.ProjectPath == ProjectPath &&
-                t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
-
-            var fileChangeTrackerFactory = new Mock<FileChangeTrackerFactory>();
-            var fileChangeTracker1 = new Mock<FileChangeTracker>();
-            fileChangeTracker1
-                .Setup(f => f.StartListening())
-                .Verifiable();
-            fileChangeTrackerFactory
-                .Setup(f => f.Create("C:\\path\\to\\project\\Views\\Home\\_ViewImports.cshtml"))
-                .Returns(fileChangeTracker1.Object)
-                .Verifiable();
-            var fileChangeTracker2 = new Mock<FileChangeTracker>();
-            fileChangeTracker2
-                .Setup(f => f.StartListening())
-                .Verifiable();
-            fileChangeTrackerFactory
-                .Setup(f => f.Create("C:\\path\\to\\project\\Views\\_ViewImports.cshtml"))
-                .Returns(fileChangeTracker2.Object)
-                .Verifiable();
-            var fileChangeTracker3 = new Mock<FileChangeTracker>();
-            fileChangeTracker3.Setup(f => f.StartListening()).Verifiable();
-            fileChangeTrackerFactory
-                .Setup(f => f.Create("C:\\path\\to\\project\\_ViewImports.cshtml"))
-                .Returns(fileChangeTracker3.Object)
-                .Verifiable();
-
-            var manager = new DefaultImportDocumentManager(Dispatcher, new DefaultErrorReporter(), fileChangeTrackerFactory.Object);
-
-            // Act
-            manager.OnSubscribed(tracker);
-
-            // Assert
-            fileChangeTrackerFactory.Verify();
-            fileChangeTracker1.Verify();
-            fileChangeTracker2.Verify();
-            fileChangeTracker3.Verify();
-        }
-
-        [ForegroundFact]
-        public void OnSubscribed_AlreadySubscribed_DoesNothing()
-        {
-            // Arrange
-            var tracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\file.cshtml" &&
-                t.ProjectPath == ProjectPath &&
-                t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
-
-            var anotherTracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\anotherFile.cshtml" && 
-                t.ProjectPath == ProjectPath &&
-                t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
-
-            var callCount = 0;
-            var fileChangeTrackerFactory = new Mock<FileChangeTrackerFactory>();
-            fileChangeTrackerFactory
-                .Setup(f => f.Create(It.IsAny<string>()))
-                .Returns(Mock.Of<FileChangeTracker>())
-                .Callback(() => callCount++);
-
-            var manager = new DefaultImportDocumentManager(Dispatcher, new DefaultErrorReporter(), fileChangeTrackerFactory.Object);
-            manager.OnSubscribed(tracker); // Start tracking the import.
-
-            // Act
-            manager.OnSubscribed(anotherTracker);
-
-            // Assert
-            Assert.Equal(1, callCount);
-        }
-
-        [ForegroundFact]
-        public void OnUnsubscribed_StopsFileChangeTracker()
-        {
-            // Arrange
-            var tracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\file.cshtml" &&
-                t.ProjectPath == ProjectPath &&
-                t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
-
-            var fileChangeTrackerFactory = new Mock<FileChangeTrackerFactory>(MockBehavior.Strict);
-            var fileChangeTracker = new Mock<FileChangeTracker>();
-            fileChangeTracker
-                .Setup(f => f.StopListening())
-                .Verifiable();
-            fileChangeTrackerFactory
-                .Setup(f => f.Create("C:\\path\\to\\project\\_ViewImports.cshtml"))
-                .Returns(fileChangeTracker.Object)
-                .Verifiable();
-
-            var manager = new DefaultImportDocumentManager(Dispatcher, new DefaultErrorReporter(), fileChangeTrackerFactory.Object);
-            manager.OnSubscribed(tracker); // Start tracking the import.
-
-            // Act
-            manager.OnUnsubscribed(tracker);
-
-            // Assert
-            fileChangeTrackerFactory.Verify();
-            fileChangeTracker.Verify();
-        }
-
-        [ForegroundFact]
-        public void OnUnsubscribed_AnotherDocumentTrackingImport_DoesNotStopFileChangeTracker()
-        {
-            // Arrange
-            var tracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\file.cshtml" && 
-                t.ProjectPath == ProjectPath &&
-                t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
-
-            var anotherTracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\anotherFile.cshtml" &&
-                t.ProjectPath == ProjectPath &&
-                t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
-
-            var fileChangeTrackerFactory = new Mock<FileChangeTrackerFactory>();
-            var fileChangeTracker = new Mock<FileChangeTracker>();
-            fileChangeTracker
-                .Setup(f => f.StopListening())
-                .Throws(new InvalidOperationException());
-            fileChangeTrackerFactory
-                .Setup(f => f.Create(It.IsAny<string>()))
-                .Returns(fileChangeTracker.Object);
-
-            var manager = new DefaultImportDocumentManager(Dispatcher, new DefaultErrorReporter(), fileChangeTrackerFactory.Object);
-            manager.OnSubscribed(tracker); // Starts tracking import for the first document.
-
-            manager.OnSubscribed(anotherTracker); // Starts tracking import for the second document.
-
-            // Act & Assert (Does not throw)
-            manager.OnUnsubscribed(tracker);
-            manager.OnUnsubscribed(tracker);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultProjectPathProviderTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultProjectPathProviderTest.cs
deleted file mode 100644
index 1633b6bda37b..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultProjectPathProviderTest.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.VisualStudio.Text;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultProjectPathProviderTest
-    {
-        [Fact]
-        public void TryGetProjectPath_ReturnsFalseIfNoProject()
-        {
-            // Arrange
-            var projectPathProvider = new DefaultProjectPathProvider(Mock.Of<TextBufferProjectService>());
-            var textBuffer = Mock.Of<ITextBuffer>();
-
-            // Act
-            var result = projectPathProvider.TryGetProjectPath(textBuffer, out var filePath);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(filePath);
-        }
-
-        [Fact]
-        public void TryGetProjectPath_ReturnsTrueIfProject()
-        {
-            // Arrange
-            var expectedProjectPath = "/my/project/path.csproj";
-            var projectService = new Mock<TextBufferProjectService>();
-            projectService.Setup(service => service.GetHostProject(It.IsAny<ITextBuffer>()))
-                .Returns(new object());
-            projectService.Setup(service => service.GetProjectPath(It.IsAny<object>()))
-                .Returns(expectedProjectPath);
-            var projectPathProvider = new DefaultProjectPathProvider(projectService.Object);
-            var textBuffer = Mock.Of<ITextBuffer>();
-
-            // Act
-            var result = projectPathProvider.TryGetProjectPath(textBuffer, out var filePath);
-
-            // Assert
-            Assert.True(result);
-            Assert.Equal(expectedProjectPath, filePath);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultProjectSnapshotProjectEngineFactoryTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultProjectSnapshotProjectEngineFactoryTest.cs
deleted file mode 100644
index 581d61602c26..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultProjectSnapshotProjectEngineFactoryTest.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Linq;
-using System.Reflection;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Editor.Razor;
-using Xunit;
-
-using Mvc1_X = Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X;
-using MvcLatest = Microsoft.AspNetCore.Mvc.Razor.Extensions;
-
-namespace Microsoft.CodeAnalysis.Razor
-{
-    // Testing this here because we need references to the MVC factories.
-    public class DefaultProjectSnapshotProjectEngineFactoryTest
-    {
-        public DefaultProjectSnapshotProjectEngineFactoryTest()
-        {
-            Project project = null;
-
-            Workspace = TestWorkspace.Create(workspace =>
-            {
-                var info = ProjectInfo.Create(ProjectId.CreateNewId("Test"), VersionStamp.Default, "Test", "Test", LanguageNames.CSharp, filePath: "/TestPath/SomePath/Test.csproj");
-                project = workspace.CurrentSolution.AddProject(info).GetProject(info.Id);
-            });
-
-            WorkspaceProject = project;
-
-            HostProject_For_1_0 = new HostProject("/TestPath/SomePath/Test.csproj", FallbackRazorConfiguration.MVC_1_0);
-            HostProject_For_1_1 = new HostProject("/TestPath/SomePath/Test.csproj", FallbackRazorConfiguration.MVC_1_1);
-            HostProject_For_2_0 = new HostProject("/TestPath/SomePath/Test.csproj", FallbackRazorConfiguration.MVC_2_0);
-
-            HostProject_For_2_1 = new HostProject(
-                "/TestPath/SomePath/Test.csproj",
-                new ProjectSystemRazorConfiguration(RazorLanguageVersion.Version_2_1, "MVC-2.1", Array.Empty<RazorExtension>()));
-            HostProject_For_UnknownConfiguration = new HostProject(
-                "/TestPath/SomePath/Test.csproj",
-                new ProjectSystemRazorConfiguration(RazorLanguageVersion.Version_2_1, "Blazor-0.1", Array.Empty<RazorExtension>()));
-
-            Snapshot_For_1_0 = new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, HostProject_For_1_0, WorkspaceProject));
-            Snapshot_For_1_1 = new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, HostProject_For_1_1, WorkspaceProject));
-            Snapshot_For_2_0 = new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, HostProject_For_2_0, WorkspaceProject));
-            Snapshot_For_2_1 = new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, HostProject_For_2_1, WorkspaceProject));
-            Snapshot_For_UnknownConfiguration = new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, HostProject_For_UnknownConfiguration, WorkspaceProject));
-
-            CustomFactories = new Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>[]
-            {
-                new Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>(
-                    () => new LegacyProjectEngineFactory_1_0(),
-                    typeof(LegacyProjectEngineFactory_1_0).GetCustomAttribute<ExportCustomProjectEngineFactoryAttribute>()),
-                new Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>(
-                    () => new LegacyProjectEngineFactory_1_1(),
-                    typeof(LegacyProjectEngineFactory_1_1).GetCustomAttribute<ExportCustomProjectEngineFactoryAttribute>()),
-                new Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>(
-                    () => new LegacyProjectEngineFactory_2_0(),
-                    typeof(LegacyProjectEngineFactory_2_0).GetCustomAttribute<ExportCustomProjectEngineFactoryAttribute>()),
-                new Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>(
-                    () => new LegacyProjectEngineFactory_2_1(),
-                    typeof(LegacyProjectEngineFactory_2_1).GetCustomAttribute<ExportCustomProjectEngineFactoryAttribute>()),
-            };
-
-            FallbackFactory = new FallbackProjectEngineFactory();
-        }
-
-        private Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>[] CustomFactories { get; }
-
-        private IFallbackProjectEngineFactory FallbackFactory { get; }
-
-        private HostProject HostProject_For_1_0 { get; }
-
-        private HostProject HostProject_For_1_1 { get; }
-
-        private HostProject HostProject_For_2_0 { get; }
-
-        private HostProject HostProject_For_2_1 { get; }
-
-        private HostProject HostProject_For_UnknownConfiguration { get; }
-
-        private ProjectSnapshot Snapshot_For_1_0 { get; }
-
-        private ProjectSnapshot Snapshot_For_1_1 { get; }
-
-        private ProjectSnapshot Snapshot_For_2_0 { get; }
-
-        private ProjectSnapshot Snapshot_For_2_1 { get; }
-
-        private ProjectSnapshot Snapshot_For_UnknownConfiguration { get; }
-        
-        private Project WorkspaceProject { get; }
-
-        private Workspace Workspace { get; }
-
-        [Fact]
-        public void Create_CreatesDesignTimeTemplateEngine_ForVersion2_1()
-        {
-            // Arrange
-            var snapshot = Snapshot_For_2_1;
-
-            var factory = new DefaultProjectSnapshotProjectEngineFactory(FallbackFactory, CustomFactories);
-
-            // Act
-            var engine = factory.Create(snapshot, b =>
-            {
-                b.Features.Add(new MyCoolNewFeature());
-            });
-
-            // Assert
-            Assert.Single(engine.Engine.Features.OfType<MyCoolNewFeature>());
-            Assert.Single(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperDescriptorProvider>());
-            Assert.Single(engine.Engine.Features.OfType<MvcLatest.MvcViewDocumentClassifierPass>());
-            Assert.Single(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperPass>());
-        }
-
-        [Fact]
-        public void Create_CreatesDesignTimeTemplateEngine_ForVersion2_0()
-        {
-            // Arrange
-            var snapshot = Snapshot_For_2_0;
-
-            var factory = new DefaultProjectSnapshotProjectEngineFactory(FallbackFactory, CustomFactories);
-
-            // Act
-            var engine = factory.Create(snapshot, b =>
-            {
-                b.Features.Add(new MyCoolNewFeature());
-            });
-
-            // Assert
-            Assert.Single(engine.Engine.Features.OfType<MyCoolNewFeature>());
-            Assert.Single(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperDescriptorProvider>());
-            Assert.Single(engine.Engine.Features.OfType<MvcLatest.MvcViewDocumentClassifierPass>());
-            Assert.Single(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperPass>());
-        }
-
-        [Fact]
-        public void Create_CreatesTemplateEngine_ForVersion1_1()
-        {
-            // Arrange
-            var snapshot = Snapshot_For_1_1;
-
-            var factory = new DefaultProjectSnapshotProjectEngineFactory(FallbackFactory, CustomFactories);
-
-            // Act
-            var engine = factory.Create(snapshot, b =>
-            {
-                b.Features.Add(new MyCoolNewFeature());
-            });
-
-            // Assert
-            Assert.Single(engine.Engine.Features.OfType<MyCoolNewFeature>());
-            Assert.Single(engine.Engine.Features.OfType<Mvc1_X.ViewComponentTagHelperDescriptorProvider>());
-            Assert.Single(engine.Engine.Features.OfType<Mvc1_X.MvcViewDocumentClassifierPass>());
-            Assert.Single(engine.Engine.Features.OfType<Mvc1_X.ViewComponentTagHelperPass>());
-        }
-
-        [Fact]
-        public void Create_DoesNotSupportViewComponentTagHelpers_ForVersion1_0()
-        {
-            // Arrange
-            var snapshot = Snapshot_For_1_0;
-
-            var factory = new DefaultProjectSnapshotProjectEngineFactory(FallbackFactory, CustomFactories);
-
-            // Act
-            var engine = factory.Create(snapshot, b =>
-            {
-                b.Features.Add(new MyCoolNewFeature());
-            });
-
-            // Assert
-            Assert.Single(engine.Engine.Features.OfType<MyCoolNewFeature>());
-            Assert.Empty(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperDescriptorProvider>());
-            Assert.Empty(engine.Engine.Features.OfType<MvcLatest.MvcViewDocumentClassifierPass>());
-            Assert.Empty(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperPass>());
-        }
-
-        [Fact]
-        public void Create_ForUnknownConfiguration_UsesFallbackFactory()
-        {
-            var snapshot = Snapshot_For_UnknownConfiguration;
-
-            var factory = new DefaultProjectSnapshotProjectEngineFactory(FallbackFactory, CustomFactories);
-
-            // Act
-            var engine = factory.Create(snapshot, b =>
-            {
-                b.Features.Add(new MyCoolNewFeature());
-            });
-
-            // Assert
-            Assert.Single(engine.Engine.Features.OfType<MyCoolNewFeature>());
-            Assert.Empty(engine.Engine.Features.OfType<DefaultTagHelperDescriptorProvider>());
-            Assert.Empty(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperDescriptorProvider>());
-            Assert.Empty(engine.Engine.Features.OfType<MvcLatest.MvcViewDocumentClassifierPass>());
-            Assert.Empty(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperPass>());
-        }
-
-        private class MyCoolNewFeature : IRazorEngineFeature
-        {
-            public RazorEngine Engine { get; set; }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorDocumentManagerTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorDocumentManagerTest.cs
deleted file mode 100644
index 32ec4b10c749..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorDocumentManagerTest.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.Editor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.Utilities;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultRazorDocumentManagerTest : ForegroundDispatcherTestBase
-    {
-        private IContentType RazorCoreContentType { get; } = Mock.Of<IContentType>(c => c.IsOfType(RazorLanguage.CoreContentType) == true);
-
-        private IContentType NonRazorCoreContentType { get; } = Mock.Of<IContentType>(c => c.IsOfType(It.IsAny<string>()) == false);
-
-        private string FilePath => "C:/Some/Path/TestDocumentTracker.cshtml";
-
-        private string ProjectPath => "C:/Some/Path/TestProject.csproj";
-
-        private ProjectSnapshotManager ProjectManager => Mock.Of<ProjectSnapshotManager>(p => p.Projects == new List<ProjectSnapshot>());
-
-        private WorkspaceEditorSettings WorkspaceEditorSettings => new DefaultWorkspaceEditorSettings(Dispatcher, Mock.Of<EditorSettingsManager>());
-
-        private ImportDocumentManager ImportDocumentManager => Mock.Of<ImportDocumentManager>();
-
-        private Workspace Workspace => TestWorkspace.Create();
-
-        [ForegroundFact]
-        public void OnTextViewOpened_ForNonRazorTextBuffer_DoesNothing()
-        {
-            // Arrange
-            var editorFactoryService = new Mock<RazorEditorFactoryService>(MockBehavior.Strict);
-            var documentManager = new DefaultRazorDocumentManager(Dispatcher, editorFactoryService.Object);
-            var textView = Mock.Of<ITextView>();
-            var buffers = new Collection<ITextBuffer>()
-            {
-                Mock.Of<ITextBuffer>(b => b.ContentType == NonRazorCoreContentType && b.Properties == new PropertyCollection()),
-            };
-
-            // Act & Assert
-            documentManager.OnTextViewOpened(textView, buffers);
-        }
-
-        [ForegroundFact]
-        public void OnTextViewOpened_ForRazorTextBuffer_AddsTextViewToTracker()
-        {
-            // Arrange
-            var textView = Mock.Of<ITextView>();
-            var buffers = new Collection<ITextBuffer>()
-            {
-                Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection()),
-            };
-            var documentTracker = new DefaultVisualStudioDocumentTracker(Dispatcher, FilePath, ProjectPath, ProjectManager, WorkspaceEditorSettings, Workspace, buffers[0], ImportDocumentManager) as VisualStudioDocumentTracker;
-            var editorFactoryService = Mock.Of<RazorEditorFactoryService>(factoryService => factoryService.TryGetDocumentTracker(It.IsAny<ITextBuffer>(), out documentTracker) == true);
-            var documentManager = new DefaultRazorDocumentManager(Dispatcher, editorFactoryService);
-
-            // Act
-            documentManager.OnTextViewOpened(textView, buffers);
-
-            // Assert
-            Assert.Collection(documentTracker.TextViews, v => Assert.Same(v, textView));
-        }
-
-        [ForegroundFact]
-        public void OnTextViewOpened_SubscribesAfterFirstTextViewOpened()
-        {
-            // Arrange
-            var textView = Mock.Of<ITextView>();
-            var buffers = new Collection<ITextBuffer>()
-            {
-                Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection()),
-                Mock.Of<ITextBuffer>(b => b.ContentType == NonRazorCoreContentType && b.Properties == new PropertyCollection()),
-            };
-            var documentTracker = new DefaultVisualStudioDocumentTracker(Dispatcher, FilePath, ProjectPath, ProjectManager, WorkspaceEditorSettings, Workspace, buffers[0], ImportDocumentManager) as VisualStudioDocumentTracker;
-            var editorFactoryService = Mock.Of<RazorEditorFactoryService>(f => f.TryGetDocumentTracker(It.IsAny<ITextBuffer>(), out documentTracker) == true);
-            var documentManager = new DefaultRazorDocumentManager(Dispatcher, editorFactoryService);
-
-            // Assert 1
-            Assert.False(documentTracker.IsSupportedProject);
-
-            // Act
-            documentManager.OnTextViewOpened(textView, buffers);
-
-            // Assert 2
-            Assert.True(documentTracker.IsSupportedProject);
-        }
-
-        [ForegroundFact]
-        public void OnTextViewClosed_TextViewWithoutDocumentTracker_DoesNothing()
-        {
-            // Arrange
-            var documentManager = new DefaultRazorDocumentManager(Dispatcher, Mock.Of<RazorEditorFactoryService>());
-            var textView = Mock.Of<ITextView>();
-            var buffers = new Collection<ITextBuffer>()
-            {
-                Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection()),
-            };
-
-            // Act
-            documentManager.OnTextViewClosed(textView, buffers);
-
-            // Assert
-            Assert.False(buffers[0].Properties.ContainsProperty(typeof(VisualStudioDocumentTracker)));
-        }
-
-        [ForegroundFact]
-        public void OnTextViewClosed_ForAnyTextBufferWithTracker_RemovesTextView()
-        {
-            // Arrange
-            var textView1 = Mock.Of<ITextView>();
-            var textView2 = Mock.Of<ITextView>();
-            var buffers = new Collection<ITextBuffer>()
-            {
-                Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection()),
-                Mock.Of<ITextBuffer>(b => b.ContentType == NonRazorCoreContentType && b.Properties == new PropertyCollection()),
-            };
-
-            // Preload the buffer's properties with a tracker, so it's like we've already tracked this one.
-            var documentTracker = new DefaultVisualStudioDocumentTracker(Dispatcher, FilePath, ProjectPath, ProjectManager, WorkspaceEditorSettings, Workspace, buffers[0], ImportDocumentManager);
-            documentTracker.AddTextView(textView1);
-            documentTracker.AddTextView(textView2);
-            buffers[0].Properties.AddProperty(typeof(VisualStudioDocumentTracker), documentTracker);
-
-            documentTracker = new DefaultVisualStudioDocumentTracker(Dispatcher, FilePath, ProjectPath, ProjectManager, WorkspaceEditorSettings, Workspace, buffers[1], ImportDocumentManager);
-            documentTracker.AddTextView(textView1);
-            documentTracker.AddTextView(textView2);
-            buffers[1].Properties.AddProperty(typeof(VisualStudioDocumentTracker), documentTracker);
-
-            var editorFactoryService = Mock.Of<RazorEditorFactoryService>();
-            var documentManager = new DefaultRazorDocumentManager(Dispatcher, editorFactoryService);
-
-            // Act
-            documentManager.OnTextViewClosed(textView2, buffers);
-
-            // Assert
-            documentTracker = buffers[0].Properties.GetProperty<DefaultVisualStudioDocumentTracker>(typeof(VisualStudioDocumentTracker));
-            Assert.Collection(documentTracker.TextViews, v => Assert.Same(v, textView1));
-
-            documentTracker = buffers[1].Properties.GetProperty<DefaultVisualStudioDocumentTracker>(typeof(VisualStudioDocumentTracker));
-            Assert.Collection(documentTracker.TextViews, v => Assert.Same(v, textView1));
-        }
-
-        [ForegroundFact]
-        public void OnTextViewClosed_UnsubscribesAfterLastTextViewClosed()
-        {
-            // Arrange
-            var textView1 = Mock.Of<ITextView>();
-            var textView2 = Mock.Of<ITextView>();
-            var buffers = new Collection<ITextBuffer>()
-            {
-                Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection()),
-                Mock.Of<ITextBuffer>(b => b.ContentType == NonRazorCoreContentType && b.Properties == new PropertyCollection()),
-            };
-            var documentTracker = new DefaultVisualStudioDocumentTracker(Dispatcher, FilePath, ProjectPath, ProjectManager, WorkspaceEditorSettings, Workspace, buffers[0], ImportDocumentManager);
-            buffers[0].Properties.AddProperty(typeof(VisualStudioDocumentTracker), documentTracker);
-            var editorFactoryService = Mock.Of<RazorEditorFactoryService>();
-            var documentManager = new DefaultRazorDocumentManager(Dispatcher, editorFactoryService);
-
-            // Populate the text views
-            documentTracker.Subscribe();
-            documentTracker.AddTextView(textView1);
-            documentTracker.AddTextView(textView2);
-
-            // Act 1
-            documentManager.OnTextViewClosed(textView2, buffers);
-
-            // Assert 1
-            Assert.True(documentTracker.IsSupportedProject);
-
-            // Act
-            documentManager.OnTextViewClosed(textView1, buffers);
-
-            // Assert 2
-            Assert.False(documentTracker.IsSupportedProject);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorEditorFactoryServiceTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorEditorFactoryServiceTest.cs
deleted file mode 100644
index 49b95010c265..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorEditorFactoryServiceTest.cs
+++ /dev/null
@@ -1,275 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Utilities;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultRazorEditorFactoryServiceTest
-    {
-        private IContentType RazorCoreContentType { get; } = Mock.Of<IContentType>(c => c.IsOfType(RazorLanguage.CoreContentType) == true);
-
-        private IContentType NonRazorCoreContentType { get; } = Mock.Of<IContentType>(c => c.IsOfType(It.IsAny<string>()) == false);
-
-        [Fact]
-        public void TryGetDocumentTracker_ForRazorTextBuffer_ReturnsTrue()
-        {
-            // Arrange
-            var expectedDocumentTracker = Mock.Of<VisualStudioDocumentTracker>();
-            var factoryService = CreateFactoryService(expectedDocumentTracker);
-            var textBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection());
-
-            // Act
-            var result = factoryService.TryGetDocumentTracker(textBuffer, out var documentTracker);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(expectedDocumentTracker, documentTracker);
-        }
-
-        [Fact]
-        public void TryGetDocumentTracker_NonRazorBuffer_ReturnsFalse()
-        {
-            // Arrange
-            var factoryService = CreateFactoryService();
-            var textBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == NonRazorCoreContentType && b.Properties == new PropertyCollection());
-
-            // Act
-            var result = factoryService.TryGetDocumentTracker(textBuffer, out var documentTracker);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(documentTracker);
-        }
-
-        [Fact]
-        public void TryInitializeTextBuffer_WorkspaceAccessorCanNotAccessWorkspace_ReturnsFalse()
-        {
-            // Arrange
-            Workspace workspace = null;
-            var workspaceAccessor = new Mock<VisualStudioWorkspaceAccessor>();
-            workspaceAccessor.Setup(provider => provider.TryGetWorkspace(It.IsAny<ITextBuffer>(), out workspace))
-                .Returns(false);
-            var factoryService = new DefaultRazorEditorFactoryService(workspaceAccessor.Object);
-            var textBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection());
-
-            // Act
-            var result = factoryService.TryInitializeTextBuffer(textBuffer);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TryInitializeTextBuffer_StoresTracker_ReturnsTrue()
-        {
-            // Arrange
-            var expectedDocumentTracker = Mock.Of<VisualStudioDocumentTracker>();
-            var factoryService = CreateFactoryService(expectedDocumentTracker);
-            var textBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection());
-
-            // Act
-            var result = factoryService.TryInitializeTextBuffer(textBuffer);
-
-            // Assert
-            Assert.True(result);
-            Assert.True(textBuffer.Properties.TryGetProperty(typeof(VisualStudioDocumentTracker), out VisualStudioDocumentTracker documentTracker));
-            Assert.Same(expectedDocumentTracker, documentTracker);
-        }
-
-        [Fact]
-        public void TryInitializeTextBuffer_OnlyStoresTrackerOnTextBufferOnce_ReturnsTrue()
-        {
-            // Arrange
-            var factoryService = CreateFactoryService();
-            var textBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection());
-            factoryService.TryInitializeTextBuffer(textBuffer);
-            var expectedDocumentTracker = textBuffer.Properties[typeof(VisualStudioDocumentTracker)];
-
-            // Create a second factory service so it generates a different tracker
-            factoryService = CreateFactoryService();
-
-            // Act
-            var result = factoryService.TryInitializeTextBuffer(textBuffer);
-
-            // Assert
-            Assert.True(result);
-            Assert.True(textBuffer.Properties.TryGetProperty(typeof(VisualStudioDocumentTracker), out VisualStudioDocumentTracker documentTracker));
-            Assert.Same(expectedDocumentTracker, documentTracker);
-        }
-
-        [Fact]
-        public void TryGetParser_ForRazorTextBuffer_ReturnsTrue()
-        {
-            // Arrange
-            var expectedParser = Mock.Of<VisualStudioRazorParser>();
-            var factoryService = CreateFactoryService(parser: expectedParser);
-            var textBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection());
-
-            // Act
-            var result = factoryService.TryGetParser(textBuffer, out var parser);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(expectedParser, parser);
-        }
-
-        [Fact]
-        public void TryGetParser_NonRazorBuffer_ReturnsFalse()
-        {
-            // Arrange
-            var factoryService = CreateFactoryService();
-            var textBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == NonRazorCoreContentType && b.Properties == new PropertyCollection());
-
-            // Act
-            var result = factoryService.TryGetParser(textBuffer, out var parser);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(parser);
-        }
-
-        [Fact]
-        public void TryInitializeTextBuffer_StoresParser_ReturnsTrue()
-        {
-            // Arrange
-            var expectedParser = Mock.Of<VisualStudioRazorParser>();
-            var factoryService = CreateFactoryService(parser: expectedParser);
-            var textBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection());
-
-            // Act
-            var result = factoryService.TryInitializeTextBuffer(textBuffer);
-
-            // Assert
-            Assert.True(result);
-            Assert.True(textBuffer.Properties.TryGetProperty(typeof(VisualStudioRazorParser), out VisualStudioRazorParser parser));
-            Assert.Same(expectedParser, parser);
-        }
-
-        [Fact]
-        public void TryInitializeTextBuffer_OnlyStoresParserOnTextBufferOnce_ReturnsTrue()
-        {
-            // Arrange
-            var factoryService = CreateFactoryService();
-            var textBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection());
-            factoryService.TryInitializeTextBuffer(textBuffer);
-            var expectedParser = textBuffer.Properties[typeof(VisualStudioRazorParser)];
-
-            // Create a second factory service so it generates a different parser
-            factoryService = CreateFactoryService();
-
-            // Act
-            var result = factoryService.TryInitializeTextBuffer(textBuffer);
-
-            // Assert
-            Assert.True(result);
-            Assert.True(textBuffer.Properties.TryGetProperty(typeof(VisualStudioRazorParser), out VisualStudioRazorParser parser));
-            Assert.Same(expectedParser, parser);
-        }
-
-        [Fact]
-        public void TryGetSmartIndenter_ForRazorTextBuffer_ReturnsTrue()
-        {
-            // Arrange
-            var expectedSmartIndenter = Mock.Of<BraceSmartIndenter>();
-            var factoryService = CreateFactoryService(smartIndenter: expectedSmartIndenter);
-            var textBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection());
-
-            // Act
-            var result = factoryService.TryGetSmartIndenter(textBuffer, out var smartIndenter);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(expectedSmartIndenter, smartIndenter);
-        }
-
-        [Fact]
-        public void TryGetSmartIndenter_NonRazorBuffer_ReturnsFalse()
-        {
-            // Arrange
-            var factoryService = CreateFactoryService();
-            var textBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == NonRazorCoreContentType && b.Properties == new PropertyCollection());
-
-            // Act
-            var result = factoryService.TryGetSmartIndenter(textBuffer, out var smartIndenter);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(smartIndenter);
-        }
-
-        [Fact]
-        public void TryInitializeTextBuffer_StoresSmartIndenter_ReturnsTrue()
-        {
-            // Arrange
-            var expectedSmartIndenter = Mock.Of<BraceSmartIndenter>();
-            var factoryService = CreateFactoryService(smartIndenter: expectedSmartIndenter);
-            var textBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection());
-
-            // Act
-            var result = factoryService.TryInitializeTextBuffer(textBuffer);
-
-            // Assert
-            Assert.True(result);
-            Assert.True(textBuffer.Properties.TryGetProperty(typeof(BraceSmartIndenter), out BraceSmartIndenter smartIndenter));
-            Assert.Same(expectedSmartIndenter, smartIndenter);
-        }
-
-        [Fact]
-        public void TryInitializeTextBuffer_OnlyStoresSmartIndenterOnTextBufferOnce_ReturnsTrue()
-        {
-            // Arrange
-            var factoryService = CreateFactoryService();
-            var textBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType && b.Properties == new PropertyCollection());
-            factoryService.TryInitializeTextBuffer(textBuffer);
-            var expectedSmartIndenter = textBuffer.Properties[typeof(BraceSmartIndenter)];
-
-            // Create a second factory service so it generates a different smart indenter
-            factoryService = CreateFactoryService();
-
-            // Act
-            var result = factoryService.TryInitializeTextBuffer(textBuffer);
-
-            // Assert
-            Assert.True(result);
-            Assert.True(textBuffer.Properties.TryGetProperty(typeof(BraceSmartIndenter), out BraceSmartIndenter smartIndenter));
-            Assert.Same(expectedSmartIndenter, smartIndenter);
-        }
-
-        private static DefaultRazorEditorFactoryService CreateFactoryService(
-            VisualStudioDocumentTracker documentTracker = null,
-            VisualStudioRazorParser parser = null,
-            BraceSmartIndenter smartIndenter = null)
-        {
-            documentTracker = documentTracker ?? Mock.Of<VisualStudioDocumentTracker>();
-            parser = parser ?? Mock.Of<VisualStudioRazorParser>();
-            smartIndenter = smartIndenter ?? Mock.Of<BraceSmartIndenter>();
-
-            var documentTrackerFactory = Mock.Of<VisualStudioDocumentTrackerFactory>(f => f.Create(It.IsAny<ITextBuffer>()) == documentTracker);
-            var parserFactory = Mock.Of<VisualStudioRazorParserFactory>(f => f.Create(It.IsAny<VisualStudioDocumentTracker>()) == parser);
-            var smartIndenterFactory = Mock.Of<BraceSmartIndenterFactory>(f => f.Create(It.IsAny<VisualStudioDocumentTracker>()) == smartIndenter);
-
-            var services = TestServices.Create(new ILanguageService[]
-            {
-                documentTrackerFactory,
-                parserFactory,
-                smartIndenterFactory
-            });
-
-            var workspace = TestWorkspace.Create(services);
-            var workspaceAccessor = new Mock<VisualStudioWorkspaceAccessor>();
-            workspaceAccessor.Setup(p => p.TryGetWorkspace(It.IsAny<ITextBuffer>(), out workspace))
-                .Returns(true);
-
-            var factoryService = new DefaultRazorEditorFactoryService(workspaceAccessor.Object);
-
-            return factoryService;
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorIndentationFactsServiceTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorIndentationFactsServiceTest.cs
deleted file mode 100644
index dcc7c8cadce3..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorIndentationFactsServiceTest.cs
+++ /dev/null
@@ -1,361 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Microsoft.VisualStudio.Text;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultRazorIndentationFactsServiceTest
-    {
-        [Fact]
-        public void GetPreviousLineEndIndex_ReturnsPreviousLine()
-        {
-            // Arrange
-            var textSnapshot = new StringTextSnapshot(@"@{
-    <p>Hello World</p>
-}");
-            var line = textSnapshot.GetLineFromLineNumber(2);
-
-            // Act
-            var previousLineEndIndex = DefaultRazorIndentationFactsService.GetPreviousLineEndIndex(textSnapshot, line);
-
-            // Assert
-            Assert.Equal(24 + Environment.NewLine.Length, previousLineEndIndex);
-        }
-
-        [Fact]
-        public void IsCSharpOpenCurlyBrace_SpanWithLeftBrace_ReturnTrue()
-        {
-            // Arrange
-            var childBuilder = new SpanBuilder(SourceLocation.Zero);
-            childBuilder.Accept(new CSharpToken("{", CSharpTokenType.LeftBrace));
-            var child = childBuilder.Build();
-
-            // Act
-            var result = DefaultRazorIndentationFactsService.IsCSharpOpenCurlyBrace(child);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Theory]
-        [InlineData("if", CSharpTokenType.Keyword)]
-        [InlineData("}", CSharpTokenType.RightBrace)]
-        [InlineData("++", CSharpTokenType.Increment)]
-        [InlineData("text", CSharpTokenType.Identifier)]
-        public void IsCSharpOpenCurlyBrace_SpanWithUnsupportedSymbolType_ReturnFalse(string content, object symbolTypeObject)
-        {
-            // Arrange
-            var symbolType = (CSharpTokenType)symbolTypeObject;
-            var childBuilder = new SpanBuilder(SourceLocation.Zero);
-            childBuilder.Accept(new CSharpToken(content, symbolType));
-            var child = childBuilder.Build();
-
-            // Act
-            var result = DefaultRazorIndentationFactsService.IsCSharpOpenCurlyBrace(child);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void IsCSharpOpenCurlyBrace_MultipleSymbols_ReturnFalse()
-        {
-            // Arrange
-            var childBuilder = new SpanBuilder(SourceLocation.Zero);
-            childBuilder.Accept(new CSharpToken("hello", CSharpTokenType.Identifier));
-            childBuilder.Accept(new CSharpToken(",", CSharpTokenType.Comma));
-            var child = childBuilder.Build();
-
-            // Act
-            var result = DefaultRazorIndentationFactsService.IsCSharpOpenCurlyBrace(child);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void IsCSharpOpenCurlyBrace_SpanWithHtmlSymbol_ReturnFalse()
-        {
-            // Arrange
-            var childBuilder = new SpanBuilder(SourceLocation.Zero);
-            childBuilder.Accept(new HtmlToken("hello", HtmlTokenType.Text));
-            var child = childBuilder.Build();
-
-            // Act
-            var result = DefaultRazorIndentationFactsService.IsCSharpOpenCurlyBrace(child);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void IsCSharpOpenCurlyBrace_Blocks_ReturnFalse()
-        {
-            // Arrange
-            var child = new BlockBuilder()
-            {
-                Type = BlockKindInternal.Markup,
-            }.Build();
-
-            // Act
-            var result = DefaultRazorIndentationFactsService.IsCSharpOpenCurlyBrace(child);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void GetIndentLevelOfLine_AddsTabsOnlyAtBeginningOfLine()
-        {
-            // Arrange
-            var text = "\t\tHello\tWorld.\t";
-            var service = new DefaultRazorIndentationFactsService();
-
-            // Act
-            var indentLevel = service.GetIndentLevelOfLine(text, 4);
-
-            // Assert
-            Assert.Equal(8, indentLevel);
-        }
-
-        [Fact]
-        public void GetIndentLevelOfLine_AddsSpacesOnlyAtBeginningOfLine()
-        {
-            // Arrange
-            var text = "   Hello World. ";
-            var service = new DefaultRazorIndentationFactsService();
-
-            // Act
-            var indentLevel = service.GetIndentLevelOfLine(text, 4);
-
-            // Assert
-            Assert.Equal(3, indentLevel);
-        }
-
-        [Fact]
-        public void GetIndentLevelOfLine_AddsTabsAndSpacesOnlyAtBeginningOfLine()
-        {
-            // Arrange
-            var text = "  \t \tHello\t World.\t ";
-            var service = new DefaultRazorIndentationFactsService();
-
-            // Act
-            var indentLevel = service.GetIndentLevelOfLine(text, 4);
-
-            // Assert
-            Assert.Equal(11, indentLevel);
-        }
-
-        [Fact]
-        public void GetIndentLevelOfLine_NoIndent()
-        {
-            // Arrange
-            var text = "Hello World.";
-            var service = new DefaultRazorIndentationFactsService();
-
-            // Act
-            var indentLevel = service.GetIndentLevelOfLine(text, 4);
-
-            // Assert
-            Assert.Equal(0, indentLevel);
-        }
-
-        // This test verifies that we still operate on SyntaxTree's that have gaps in them. The gaps are temporary
-        // until our work with the parser has been completed.
-        [Fact]
-        public void GetDesiredIndentation_ReturnsNull_IfOwningSpanDoesNotExist()
-        {
-            // Arrange
-            var source = new StringTextSnapshot($@"
-<div>
-    <div>
-    </div>
-</div>
-");
-            var syntaxTree = GetSyntaxTree(new StringTextSnapshot("something else"));
-            var service = new DefaultRazorIndentationFactsService();
-
-            // Act
-            var indentation = service.GetDesiredIndentation(
-                syntaxTree,
-                source,
-                source.GetLineFromLineNumber(3),
-                indentSize: 4,
-                tabSize: 1);
-
-            // Assert
-            Assert.Null(indentation);
-        }
-
-        [Fact]
-        public void GetDesiredIndentation_ReturnsNull_IfOwningSpanIsCode()
-        {
-            // Arrange
-            var source = new StringTextSnapshot($@"
-@{{
-");
-            var syntaxTree = GetSyntaxTree(source);
-            var service = new DefaultRazorIndentationFactsService();
-
-            // Act
-            var indentation = service.GetDesiredIndentation(
-                syntaxTree,
-                source,
-                source.GetLineFromLineNumber(2),
-                indentSize: 4,
-                tabSize: 1);
-
-            // Assert
-            Assert.Null(indentation);
-        }
-
-        [Fact]
-        public void GetDesiredIndentation_ReturnsNull_IfOwningSpanIsNone()
-        {
-            // Arrange
-            var customDirective = DirectiveDescriptor.CreateSingleLineDirective("custom");
-            var source = new StringTextSnapshot($@"
-@custom
-");
-            var syntaxTree = GetSyntaxTree(source, new[] { customDirective });
-            var service = new DefaultRazorIndentationFactsService();
-
-            // Act
-            var indentation = service.GetDesiredIndentation(
-                syntaxTree,
-                source,
-                source.GetLineFromLineNumber(2),
-                indentSize: 4,
-                tabSize: 1);
-
-            // Assert
-            Assert.Null(indentation);
-        }
-
-        [Fact]
-        public void GetDesiredIndentation_ReturnsCorrectIndentation_ForMarkupWithinCodeBlock()
-        {
-            // Arrange
-            var source = new StringTextSnapshot($@"@{{
-    <div>
-");
-            var syntaxTree = GetSyntaxTree(source);
-            var service = new DefaultRazorIndentationFactsService();
-
-            // Act
-            var indentation = service.GetDesiredIndentation(
-                syntaxTree,
-                source,
-                source.GetLineFromLineNumber(2),
-                indentSize: 4,
-                tabSize: 4);
-
-            // Assert
-            Assert.Equal(4, indentation);
-        }
-
-        [Fact]
-        public void GetDesiredIndentation_ReturnsCorrectIndentation_ForMarkupWithinDirectiveBlock()
-        {
-            // Arrange
-            var customDirective = DirectiveDescriptor.CreateRazorBlockDirective("custom");
-            var source = new StringTextSnapshot($@"@custom
-{{
-    <div>
-}}");
-            var syntaxTree = GetSyntaxTree(source, new[] { customDirective });
-            var service = new DefaultRazorIndentationFactsService();
-
-            // Act
-            var indentation = service.GetDesiredIndentation(
-                syntaxTree,
-                source,
-                source.GetLineFromLineNumber(3),
-                indentSize: 4,
-                tabSize: 4);
-
-            // Assert
-            Assert.Equal(4, indentation);
-        }
-
-        [Fact]
-        public void GetDesiredIndentation_ReturnsCorrectIndentation_ForNestedMarkupWithinCodeBlock()
-        {
-            // Arrange
-            var source = new StringTextSnapshot($@"
-<div>
-    @{{
-        <span>
-    }}
-</div>
-");
-            var syntaxTree = GetSyntaxTree(source);
-            var service = new DefaultRazorIndentationFactsService();
-
-            // Act
-            var indentation = service.GetDesiredIndentation(
-                syntaxTree,
-                source,
-                source.GetLineFromLineNumber(4),
-                indentSize: 4,
-                tabSize: 4);
-
-            // Assert
-            Assert.Equal(8, indentation);
-        }
-
-        [Fact]
-        public void GetDesiredIndentation_ReturnsCorrectIndentation_ForMarkupWithinCodeBlockInADirectiveBlock()
-        {
-            // Arrange
-            var customDirective = DirectiveDescriptor.CreateRazorBlockDirective("custom");
-            var source = new StringTextSnapshot($@"@custom
-{{
-    @{{
-        <div>
-    }}
-}}");
-            var syntaxTree = GetSyntaxTree(source, new[] { customDirective });
-            var service = new DefaultRazorIndentationFactsService();
-
-            // Act
-            var indentation = service.GetDesiredIndentation(
-                syntaxTree,
-                source,
-                source.GetLineFromLineNumber(4),
-                indentSize: 4,
-                tabSize: 4);
-
-            // Assert
-            Assert.Equal(8, indentation);
-        }
-
-        private static RazorSyntaxTree GetSyntaxTree(StringTextSnapshot source, IEnumerable<DirectiveDescriptor> directives = null)
-        {
-            directives = directives ?? Enumerable.Empty<DirectiveDescriptor>();
-            var engine = RazorProjectEngine.Create(builder =>
-            {
-                foreach (var directive in directives)
-                {
-                    builder.AddDirective(directive);
-                }
-            });
-
-            var sourceProjectItem = new TestRazorProjectItem("test.cshtml")
-            {
-                Content = source.GetText()
-            };
-
-            var codeDocument = engine.ProcessDesignTime(sourceProjectItem);
-
-            return codeDocument.GetSyntaxTree();
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorSyntaxFactsServiceTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorSyntaxFactsServiceTest.cs
deleted file mode 100644
index 7888cb39a3ad..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorSyntaxFactsServiceTest.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultRazorSyntaxFactsServiceTest
-    {
-        [Fact]
-        public void GetClassifiedSpans_ReturnsExpectedSpans()
-        {
-            // Arrange
-            var expectedSpans = new[]
-            {
-                new ClassifiedSpan(new SourceSpan("test.cshtml", 0, 0, 0, 5), new SourceSpan("test.cshtml", 0, 0, 0, 5), SpanKind.Markup, BlockKind.Tag, AcceptedCharacters.Any),
-                new ClassifiedSpan(new SourceSpan("test.cshtml", 5, 0, 5, 6), new SourceSpan("test.cshtml", 0, 0, 0, 42), SpanKind.Markup, BlockKind.Markup, AcceptedCharacters.Any),
-                new ClassifiedSpan(new SourceSpan("test.cshtml", 34, 1, 27, 2), new SourceSpan("test.cshtml", 0, 0, 0, 42), SpanKind.Markup, BlockKind.Markup, AcceptedCharacters.Any),
-                new ClassifiedSpan(new SourceSpan("test.cshtml", 36, 2, 0, 6), new SourceSpan("test.cshtml", 36, 2, 0, 6), SpanKind.Markup, BlockKind.Tag, AcceptedCharacters.Any),
-            };
-            var codeDocument = GetCodeDocument(
-@"<div>
-    <taghelper></taghelper>
-</div>");
-            var syntaxTree = codeDocument.GetSyntaxTree();
-            var service = new DefaultRazorSyntaxFactsService();
-
-            // Act
-            var spans = service.GetClassifiedSpans(syntaxTree);
-
-            // Assert
-            Assert.Equal(expectedSpans, spans);
-        }
-
-        [Fact]
-        public void GetClassifiedSpans_ReturnsAttributeSpansInDocumentOrder()
-        {
-            // Arrange
-            var expectedSpans = new[]
-            {
-                new ClassifiedSpan(new SourceSpan("test.cshtml", 14, 0, 14, 1), new SourceSpan("test.cshtml", 0, 0, 0, 49), SpanKind.Code, BlockKind.Tag, AcceptedCharacters.AnyExceptNewline),
-                new ClassifiedSpan(new SourceSpan("test.cshtml", 23, 0, 23, 2), new SourceSpan("test.cshtml", 0, 0, 0, 49), SpanKind.Markup, BlockKind.Tag, AcceptedCharacters.Any),
-                new ClassifiedSpan(new SourceSpan("test.cshtml", 32, 0, 32, 4), new SourceSpan("test.cshtml", 0, 0, 0, 49), SpanKind.Code, BlockKind.Tag, AcceptedCharacters.AnyExceptNewline),
-            };
-            var codeDocument = GetCodeDocument(
-@"<taghelper id=1 class=""th"" show=true></taghelper>");
-            var syntaxTree = codeDocument.GetSyntaxTree();
-            var service = new DefaultRazorSyntaxFactsService();
-
-            // Act
-            var spans = service.GetClassifiedSpans(syntaxTree);
-
-            // Assert
-            Assert.Equal(expectedSpans, spans);
-        }
-
-        [Fact]
-        public void GetTagHelperSpans_ReturnsExpectedSpans()
-        {
-            // Arrange
-            var codeDocument = GetCodeDocument(
-@"<div>
-    <taghelper></taghelper>
-</div>");
-            var tagHelperContext = codeDocument.GetTagHelperContext();
-            var expectedSourceSpan = new SourceSpan("test.cshtml", 11, 1, 4, 23);
-            var syntaxTree = codeDocument.GetSyntaxTree();
-            var service = new DefaultRazorSyntaxFactsService();
-
-            // Act
-            var spans = service.GetTagHelperSpans(syntaxTree);
-
-            // Assert
-            var actualSpan = Assert.Single(spans);
-            Assert.Equal(expectedSourceSpan, actualSpan.Span);
-            Assert.Equal(tagHelperContext.TagHelpers, actualSpan.TagHelpers);
-            Assert.Equal(tagHelperContext.Prefix, actualSpan.Binding.TagHelperPrefix);
-            Assert.Equal("div", actualSpan.Binding.ParentTagName);
-        }
-
-        private static RazorCodeDocument GetCodeDocument(string source)
-        {
-            var taghelper = TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
-                .BoundAttributeDescriptor(attr => attr.Name("show").TypeName("System.Boolean"))
-                .BoundAttributeDescriptor(attr => attr.Name("id").TypeName("System.Int32"))
-                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("taghelper"))
-                .TypeName("TestTagHelper")
-                .Build();
-            var engine = RazorProjectEngine.Create(builder =>
-            {
-                builder.AddTagHelpers(taghelper);
-                builder.SetImportFeature(new TestImportProjectFeature());
-            });
-
-            var sourceProjectItem = new TestRazorProjectItem("test.cshtml")
-            {
-                Content = source
-            };
-
-            var codeDocument = engine.ProcessDesignTime(sourceProjectItem);
-
-            return codeDocument;
-        }
-
-        private class TestImportProjectFeature : RazorProjectEngineFeatureBase, IImportProjectFeature
-        {
-            public IReadOnlyList<RazorProjectItem> GetImports(RazorProjectItem projectItem)
-            {
-                var importProjectItem = new TestRazorProjectItem("import.cshtml")
-                {
-                    Content = "@addTagHelper *, TestAssembly"
-                };
-
-                return new[] { importProjectItem };
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultTagHelperCompletionServiceTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultTagHelperCompletionServiceTest.cs
deleted file mode 100644
index 47fd565bb423..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultTagHelperCompletionServiceTest.cs
+++ /dev/null
@@ -1,1141 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultTagHelperCompletionServiceTest
-    {
-        [Fact]
-        public void GetAttributeCompletions_DoesNotReturnCompletionsForAlreadySuppliedAttributes()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("DivTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule
-                        .RequireTagName("div")
-                        .RequireAttributeDescriptor(attribute => attribute.Name("repeat")))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("visible")
-                        .TypeName(typeof(bool).FullName)
-                        .PropertyName("Visible"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("StyleTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("class")
-                        .TypeName(typeof(string).FullName)
-                        .PropertyName("Class"))
-                    .Build(),
-            };
-            var expectedCompletions = AttributeCompletionResult.Create(new Dictionary<string, HashSet<BoundAttributeDescriptor>>()
-            {
-                ["onclick"] = new HashSet<BoundAttributeDescriptor>(),
-                ["visible"] = new HashSet<BoundAttributeDescriptor>()
-                {
-                    documentDescriptors[0].BoundAttributes.Last()
-                }
-            });
-
-            var existingCompletions = new[] { "onclick" };
-            var completionContext = BuildAttributeCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                attributes: new Dictionary<string, string>()
-                {
-                    ["class"] = "something",
-                    ["repeat"] = "4"
-                },
-                currentTagName: "div");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetAttributeCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetAttributeCompletions_ReturnsCompletionForAlreadySuppliedAttribute_IfCurrentAttributeMatches()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("DivTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule
-                        .RequireTagName("div")
-                        .RequireAttributeDescriptor(attribute => attribute.Name("repeat")))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("visible")
-                        .TypeName(typeof(bool).FullName)
-                        .PropertyName("Visible"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("StyleTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("class")
-                        .TypeName(typeof(string).FullName)
-                        .PropertyName("Class"))
-                    .Build(),
-            };
-            var expectedCompletions = AttributeCompletionResult.Create(new Dictionary<string, HashSet<BoundAttributeDescriptor>>()
-            {
-                ["onclick"] = new HashSet<BoundAttributeDescriptor>(),
-                ["visible"] = new HashSet<BoundAttributeDescriptor>()
-                {
-                    documentDescriptors[0].BoundAttributes.Last()
-                }
-            });
-
-            var existingCompletions = new[] { "onclick" };
-            var completionContext = BuildAttributeCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                attributes: new Dictionary<string, string>()
-                {
-                    ["class"] = "something",
-                    ["repeat"] = "4",
-                    ["visible"] = "false",
-                },
-                currentTagName: "div",
-                currentAttributeName: "visible");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetAttributeCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetAttributeCompletions_DoesNotReturnAlreadySuppliedAttribute_IfCurrentAttributeDoesNotMatch()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("DivTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule
-                        .RequireTagName("div")
-                        .RequireAttributeDescriptor(attribute => attribute.Name("repeat")))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("visible")
-                        .TypeName(typeof(bool).FullName)
-                        .PropertyName("Visible"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("StyleTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("class")
-                        .TypeName(typeof(string).FullName)
-                        .PropertyName("Class"))
-                    .Build(),
-            };
-            var expectedCompletions = AttributeCompletionResult.Create(new Dictionary<string, HashSet<BoundAttributeDescriptor>>()
-            {
-                ["onclick"] = new HashSet<BoundAttributeDescriptor>()
-            });
-
-            var existingCompletions = new[] { "onclick" };
-            var completionContext = BuildAttributeCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                attributes: new Dictionary<string, string>()
-                {
-                    ["class"] = "something",
-                    ["repeat"] = "4",
-                    ["visible"] = "false",
-                },
-                currentTagName: "div",
-                currentAttributeName: "repeat");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetAttributeCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetAttributeCompletions_PossibleDescriptorsReturnUnboundRequiredAttributesWithExistingCompletions()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("DivTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule
-                        .RequireTagName("div")
-                        .RequireAttributeDescriptor(attribute => attribute.Name("repeat")))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("StyleTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule
-                        .RequireTagName("*")
-                        .RequireAttributeDescriptor(attribute => attribute.Name("class")))
-                    .Build(),
-            };
-            var expectedCompletions = AttributeCompletionResult.Create(new Dictionary<string, HashSet<BoundAttributeDescriptor>>()
-            {
-                ["class"] = new HashSet<BoundAttributeDescriptor>(),
-                ["onclick"] = new HashSet<BoundAttributeDescriptor>(),
-                ["repeat"] = new HashSet<BoundAttributeDescriptor>()
-            });
-
-            var existingCompletions = new[] { "onclick", "class" };
-            var completionContext = BuildAttributeCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                currentTagName: "div");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetAttributeCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetAttributeCompletions_PossibleDescriptorsReturnBoundRequiredAttributesWithExistingCompletions()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("DivTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule
-                        .RequireTagName("div")
-                        .RequireAttributeDescriptor(attribute => attribute.Name("repeat")))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("repeat")
-                        .TypeName(typeof(bool).FullName)
-                        .PropertyName("Repeat"))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("visible")
-                        .TypeName(typeof(bool).FullName)
-                        .PropertyName("Visible"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("StyleTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule
-                        .RequireTagName("*")
-                        .RequireAttributeDescriptor(attribute => attribute.Name("class")))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("class")
-                        .TypeName(typeof(string).FullName)
-                        .PropertyName("Class"))
-                    .Build(),
-            };
-            var expectedCompletions = AttributeCompletionResult.Create(new Dictionary<string, HashSet<BoundAttributeDescriptor>>()
-            {
-                ["class"] = new HashSet<BoundAttributeDescriptor>(documentDescriptors[1].BoundAttributes),
-                ["onclick"] = new HashSet<BoundAttributeDescriptor>(),
-                ["repeat"] = new HashSet<BoundAttributeDescriptor>()
-                {
-                    documentDescriptors[0].BoundAttributes.First()
-                }
-            });
-
-            var existingCompletions = new[] { "onclick" };
-            var completionContext = BuildAttributeCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                currentTagName: "div");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetAttributeCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetAttributeCompletions_AppliedDescriptorsReturnAllBoundAttributesWithExistingCompletionsForSchemaTags()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("DivTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("repeat")
-                        .TypeName(typeof(bool).FullName)
-                        .PropertyName("Repeat"))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("visible")
-                        .TypeName(typeof(bool).FullName)
-                        .PropertyName("Visible"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("StyleTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule
-                        .RequireTagName("*")
-                        .RequireAttributeDescriptor(attribute => attribute.Name("class")))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("class")
-                        .TypeName(typeof(string).FullName)
-                        .PropertyName("Class"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("StyleTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("visible")
-                        .TypeName(typeof(bool).FullName)
-                        .PropertyName("Visible"))
-                    .Build(),
-            };
-            var expectedCompletions = AttributeCompletionResult.Create(new Dictionary<string, HashSet<BoundAttributeDescriptor>>()
-            {
-                ["onclick"] = new HashSet<BoundAttributeDescriptor>(),
-                ["class"] = new HashSet<BoundAttributeDescriptor>(documentDescriptors[1].BoundAttributes),
-                ["repeat"] = new HashSet<BoundAttributeDescriptor>()
-                {
-                    documentDescriptors[0].BoundAttributes.First()
-                },
-                ["visible"] = new HashSet<BoundAttributeDescriptor>()
-                {
-                    documentDescriptors[0].BoundAttributes.Last(),
-                    documentDescriptors[2].BoundAttributes.First(),
-                }
-            });
-
-            var existingCompletions = new[] { "class", "onclick" };
-            var completionContext = BuildAttributeCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                currentTagName: "div");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetAttributeCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetAttributeCompletions_AppliedTagOutputHintDescriptorsReturnBoundAttributesWithExistingCompletionsForNonSchemaTags()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("CustomTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("custom"))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("repeat")
-                        .TypeName(typeof(bool).FullName)
-                        .PropertyName("Repeat"))
-                    .TagOutputHint("div")
-                    .Build(),
-            };
-            var expectedCompletions = AttributeCompletionResult.Create(new Dictionary<string, HashSet<BoundAttributeDescriptor>>()
-            {
-                ["class"] = new HashSet<BoundAttributeDescriptor>(),
-                ["repeat"] = new HashSet<BoundAttributeDescriptor>(documentDescriptors[0].BoundAttributes)
-            });
-
-            var existingCompletions = new[] { "class" };
-            var completionContext = BuildAttributeCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                currentTagName: "custom");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetAttributeCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetAttributeCompletions_AppliedDescriptorsReturnBoundAttributesCompletionsForNonSchemaTags()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("CustomTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("custom"))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("repeat")
-                        .TypeName(typeof(bool).FullName)
-                        .PropertyName("Repeat"))
-                    .Build(),
-            };
-            var expectedCompletions = AttributeCompletionResult.Create(new Dictionary<string, HashSet<BoundAttributeDescriptor>>()
-            {
-                ["repeat"] = new HashSet<BoundAttributeDescriptor>(documentDescriptors[0].BoundAttributes)
-            });
-
-            var existingCompletions = new[] { "class" };
-            var completionContext = BuildAttributeCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                currentTagName: "custom");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetAttributeCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetAttributeCompletions_AppliedDescriptorsReturnBoundAttributesWithExistingCompletionsForSchemaTags()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("DivTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
-                    .BoundAttributeDescriptor(attribute => attribute
-                        .Name("repeat")
-                        .TypeName(typeof(bool).FullName)
-                        .PropertyName("Repeat"))
-                    .Build(),
-            };
-            var expectedCompletions = AttributeCompletionResult.Create(new Dictionary<string, HashSet<BoundAttributeDescriptor>>()
-            {
-                ["class"] = new HashSet<BoundAttributeDescriptor>(),
-                ["repeat"] = new HashSet<BoundAttributeDescriptor>(documentDescriptors[0].BoundAttributes)
-            });
-
-            var existingCompletions = new[] { "class" };
-            var completionContext = BuildAttributeCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                currentTagName: "div");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetAttributeCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetAttributeCompletions_NoDescriptorsReturnsExistingCompletions()
-        {
-            // Arrange
-            var expectedCompletions = AttributeCompletionResult.Create(new Dictionary<string, HashSet<BoundAttributeDescriptor>>()
-            {
-                ["class"] = new HashSet<BoundAttributeDescriptor>(),
-            });
-
-            var existingCompletions = new[] { "class" };
-            var completionContext = BuildAttributeCompletionContext(
-                Enumerable.Empty<TagHelperDescriptor>(),
-                existingCompletions,
-                currentTagName: "div");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetAttributeCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetAttributeCompletions_NoDescriptorsForUnprefixedTagReturnsExistingCompletions()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("DivTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule
-                        .RequireTagName("div")
-                        .RequireAttributeDescriptor(attribute => attribute.Name("special")))
-                    .Build(),
-            };
-            var expectedCompletions = AttributeCompletionResult.Create(new Dictionary<string, HashSet<BoundAttributeDescriptor>>()
-            {
-                ["class"] = new HashSet<BoundAttributeDescriptor>(),
-            });
-
-            var existingCompletions = new[] { "class" };
-            var completionContext = BuildAttributeCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                currentTagName: "div",
-                tagHelperPrefix: "th:");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetAttributeCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetAttributeCompletions_NoDescriptorsForTagReturnsExistingCompletions()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("MyTableTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule
-                        .RequireTagName("table")
-                        .RequireAttributeDescriptor(attribute => attribute.Name("special")))
-                    .Build(),
-            };
-            var expectedCompletions = AttributeCompletionResult.Create(new Dictionary<string, HashSet<BoundAttributeDescriptor>>()
-            {
-                ["class"] = new HashSet<BoundAttributeDescriptor>(),
-            });
-
-            var existingCompletions = new[] { "class" };
-            var completionContext = BuildAttributeCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                currentTagName: "div");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetAttributeCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_TagOutputHintDoesNotFallThroughToSchemaCheck()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("MyTableTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("my-table"))
-                    .TagOutputHint("table")
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("MyTrTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("my-tr"))
-                    .TagOutputHint("tr")
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["my-table"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0] },
-                ["table"] = new HashSet<TagHelperDescriptor>(),
-            });
-
-            var existingCompletions = new[] { "table" };
-            var completionContext = BuildElementCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                containingTagName: "body",
-                containingParentTagName: null);
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_CatchAllsOnlyApplyToCompletionsStartingWithPrefix()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("LiTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("li"))
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["th:li"] = new HashSet<TagHelperDescriptor> { documentDescriptors[1], documentDescriptors[0] },
-                ["li"] = new HashSet<TagHelperDescriptor>(),
-            });
-
-            var existingCompletions = new[] { "li" };
-            var completionContext = BuildElementCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                containingTagName: "ul",
-                tagHelperPrefix: "th:");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_TagHelperPrefixIsPrependedToTagHelperCompletions()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("SuperLiTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("superli"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("LiTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("li"))
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["th:superli"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0] },
-                ["th:li"] = new HashSet<TagHelperDescriptor> { documentDescriptors[1] },
-                ["li"] = new HashSet<TagHelperDescriptor>(),
-            });
-
-            var existingCompletions = new[] { "li" };
-            var completionContext = BuildElementCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                containingTagName: "ul",
-                tagHelperPrefix: "th:");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_CatchAllsApplyToOnlyTagHelperCompletions()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("SuperLiTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("superli"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("CatchAll", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["superli"] = new HashSet<TagHelperDescriptor>() { documentDescriptors[0], documentDescriptors[1] },
-                ["li"] = new HashSet<TagHelperDescriptor>(),
-            });
-
-            var existingCompletions = new[] { "li" };
-            var completionContext = BuildElementCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                containingTagName: "ul");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_CatchAllsApplyToNonTagHelperCompletionsIfStartsWithTagHelperPrefix()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("SuperLiTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("superli"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("CatchAll", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["th:superli"] = new HashSet<TagHelperDescriptor>() { documentDescriptors[0], documentDescriptors[1] },
-                ["th:li"] = new HashSet<TagHelperDescriptor>() { documentDescriptors[1] },
-            });
-
-            var existingCompletions = new[] { "th:li" };
-            var completionContext = BuildElementCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                containingTagName: "ul",
-                tagHelperPrefix: "th:");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_AllowsMultiTargetingTagHelpers()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("BoldTagHelper1", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("strong"))
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("b"))
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("bold"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("BoldTagHelper2", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("strong"))
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["strong"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0], documentDescriptors[1] },
-                ["b"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0] },
-                ["bold"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0] },
-            });
-
-            var existingCompletions = new[] { "strong", "b", "bold" };
-            var completionContext = BuildElementCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                containingTagName: "ul");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_CombinesDescriptorsOnExistingCompletions()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("LiTagHelper1", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("li"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("LiTagHelper2", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("li"))
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["li"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0], documentDescriptors[1] },
-            });
-
-            var existingCompletions = new[] { "li" };
-            var completionContext = BuildElementCompletionContext(documentDescriptors, existingCompletions, containingTagName: "ul");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_NewCompletionsForSchemaTagsNotInExistingCompletionsAreIgnored()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("SuperLiTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("superli"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("LiTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("li"))
-                    .TagOutputHint("strong")
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("DivTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["li"] = new HashSet<TagHelperDescriptor> { documentDescriptors[1] },
-                ["superli"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0] },
-            });
-
-            var existingCompletions = new[] { "li" };
-            var completionContext = BuildElementCompletionContext(documentDescriptors, existingCompletions, containingTagName: "ul");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_OutputHintIsCrossReferencedWithExistingCompletions()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("DivTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
-                    .TagOutputHint("li")
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("LiTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("li"))
-                    .TagOutputHint("strong")
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["div"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0] },
-                ["li"] = new HashSet<TagHelperDescriptor> { documentDescriptors[1] },
-            });
-
-            var existingCompletions = new[] { "li" };
-            var completionContext = BuildElementCompletionContext(documentDescriptors, existingCompletions, containingTagName: "ul");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_EnsuresDescriptorsHaveSatisfiedParent()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("LiTagHelper1", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("li"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("LiTagHelper2", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("li").RequireParentTag("ol"))
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["li"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0] },
-            });
-
-            var existingCompletions = new[] { "li" };
-            var completionContext = BuildElementCompletionContext(documentDescriptors, existingCompletions, containingTagName: "ul");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_NoContainingParentTag_DoesNotGetCompletionForRuleWithParentTag()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("Tag1", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("outer-child-tag"))
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("child-tag").RequireParentTag("parent-tag"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("Tag2", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("parent-tag"))
-                    .AllowChildTag("child-tag")
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["outer-child-tag"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0] },
-                ["parent-tag"] = new HashSet<TagHelperDescriptor> { documentDescriptors[1] },
-            });
-
-            var completionContext = BuildElementCompletionContext(
-                documentDescriptors,
-                existingCompletions: Enumerable.Empty<string>(),
-                containingTagName: null,
-                containingParentTagName: null);
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_WithContainingParentTag_GetsCompletionForRuleWithParentTag()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("Tag1", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("outer-child-tag"))
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("child-tag").RequireParentTag("parent-tag"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("Tag2", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("parent-tag"))
-                    .AllowChildTag("child-tag")
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["child-tag"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0] },
-            });
-
-            var completionContext = BuildElementCompletionContext(
-                documentDescriptors,
-                existingCompletions: Enumerable.Empty<string>(),
-                containingTagName: "parent-tag",
-                containingParentTagName: null);
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_AllowedChildrenAreIgnoredWhenAtRoot()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("CatchAll", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
-                    .AllowChildTag("b")
-                    .AllowChildTag("bold")
-                    .AllowChildTag("div")
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>());
-
-            var existingCompletions = Enumerable.Empty<string>();
-            var completionContext = BuildElementCompletionContext(
-                documentDescriptors,
-                existingCompletions,
-                containingTagName: null,
-                containingParentTagName: null);
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_DoesNotReturnExistingCompletionsWhenAllowedChildren()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("BoldParent", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
-                    .AllowChildTag("b")
-                    .AllowChildTag("bold")
-                    .AllowChildTag("div")
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["b"] = new HashSet<TagHelperDescriptor>(),
-                ["bold"] = new HashSet<TagHelperDescriptor>(),
-                ["div"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0] }
-            });
-
-            var existingCompletions = new[] { "p", "em" };
-            var completionContext = BuildElementCompletionContext(documentDescriptors, existingCompletions, containingTagName: "div");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_CapturesAllAllowedChildTagsFromParentTagHelpers_NoneTagHelpers()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("BoldParent", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
-                    .AllowChildTag("b")
-                    .AllowChildTag("bold")
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["b"] = new HashSet<TagHelperDescriptor>(),
-                ["bold"] = new HashSet<TagHelperDescriptor>(),
-            });
-
-            var completionContext = BuildElementCompletionContext(documentDescriptors, Enumerable.Empty<string>(), containingTagName: "div");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_CapturesAllAllowedChildTagsFromParentTagHelpers_SomeTagHelpers()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("BoldParent", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
-                    .AllowChildTag("b")
-                    .AllowChildTag("bold")
-                    .AllowChildTag("div")
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["b"] = new HashSet<TagHelperDescriptor>(),
-                ["bold"] = new HashSet<TagHelperDescriptor>(),
-                ["div"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0] }
-            });
-
-            var completionContext = BuildElementCompletionContext(documentDescriptors, Enumerable.Empty<string>(), containingTagName: "div");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        [Fact]
-        public void GetElementCompletions_CapturesAllAllowedChildTagsFromParentTagHelpers_AllTagHelpers()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("BoldParentCatchAll", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
-                    .AllowChildTag("strong")
-                    .AllowChildTag("div")
-                    .AllowChildTag("b")
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("BoldParent", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
-                    .AllowChildTag("b")
-                    .AllowChildTag("bold")
-                    .Build(),
-            };
-            var expectedCompletions = ElementCompletionResult.Create(new Dictionary<string, HashSet<TagHelperDescriptor>>()
-            {
-                ["strong"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0] },
-                ["b"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0] },
-                ["bold"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0] },
-                ["div"] = new HashSet<TagHelperDescriptor> { documentDescriptors[0], documentDescriptors[1] },
-            });
-
-            var completionContext = BuildElementCompletionContext(documentDescriptors, Enumerable.Empty<string>(), containingTagName: "div");
-            var service = CreateTagHelperCompletionFactsService();
-
-            // Act
-            var completions = service.GetElementCompletions(completionContext);
-
-            // Assert
-            AssertCompletionsAreEquivalent(expectedCompletions, completions);
-        }
-
-        private static DefaultTagHelperCompletionService CreateTagHelperCompletionFactsService()
-        {
-            var tagHelperFactsService = new DefaultTagHelperFactsService();
-            var completionFactService = new DefaultTagHelperCompletionService(tagHelperFactsService);
-
-            return completionFactService;
-        }
-
-        private static void AssertCompletionsAreEquivalent(ElementCompletionResult expected, ElementCompletionResult actual)
-        {
-            Assert.Equal(expected.Completions.Count, actual.Completions.Count);
-
-            foreach (var expectedCompletion in expected.Completions)
-            {
-                var actualValue = actual.Completions[expectedCompletion.Key];
-                Assert.NotNull(actualValue);
-                Assert.Equal(expectedCompletion.Value, actualValue, TagHelperDescriptorComparer.CaseSensitive);
-            }
-        }
-
-        private static void AssertCompletionsAreEquivalent(AttributeCompletionResult expected, AttributeCompletionResult actual)
-        {
-            Assert.Equal(expected.Completions.Count, actual.Completions.Count);
-
-            foreach (var expectedCompletion in expected.Completions)
-            {
-                var actualValue = actual.Completions[expectedCompletion.Key];
-                Assert.NotNull(actualValue);
-                Assert.Equal(expectedCompletion.Value, actualValue, BoundAttributeDescriptorComparer.CaseSensitive);
-            }
-        }
-
-        private static ElementCompletionContext BuildElementCompletionContext(
-            IEnumerable<TagHelperDescriptor> descriptors,
-            IEnumerable<string> existingCompletions,
-            string containingTagName,
-            string containingParentTagName = "body",
-            bool containingParentIsTagHelper = false,
-            string tagHelperPrefix = "")
-        {
-            var documentContext = TagHelperDocumentContext.Create(tagHelperPrefix, descriptors);
-            var completionContext = new ElementCompletionContext(
-                documentContext,
-                existingCompletions,
-                containingTagName,
-                attributes: Enumerable.Empty<KeyValuePair<string, string>>(),
-                containingParentTagName: containingParentTagName,
-                containingParentIsTagHelper: containingParentIsTagHelper,
-                inHTMLSchema: (tag) => tag == "strong" || tag == "b" || tag == "bold" || tag == "li" || tag == "div");
-
-            return completionContext;
-        }
-
-        private static AttributeCompletionContext BuildAttributeCompletionContext(
-            IEnumerable<TagHelperDescriptor> descriptors,
-            IEnumerable<string> existingCompletions,
-            string currentTagName,
-            string currentAttributeName = null,
-            IEnumerable<KeyValuePair<string, string>> attributes = null,
-            string tagHelperPrefix = "")
-        {
-            attributes = attributes ?? Enumerable.Empty<KeyValuePair<string, string>>();
-            var documentContext = TagHelperDocumentContext.Create(tagHelperPrefix, descriptors);
-            var completionContext = new AttributeCompletionContext(
-                documentContext,
-                existingCompletions,
-                currentTagName,
-                currentAttributeName,
-                attributes,
-                currentParentTagName: "body",
-                currentParentIsTagHelper: false,
-                inHTMLSchema: (tag) => tag == "strong" || tag == "b" || tag == "bold" || tag == "li" || tag == "div");
-
-            return completionContext;
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultTagHelperFactsServiceTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultTagHelperFactsServiceTest.cs
deleted file mode 100644
index 5d2d12452d2d..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultTagHelperFactsServiceTest.cs
+++ /dev/null
@@ -1,388 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultTagHelperFactsServiceTest
-    {
-        // Purposefully not thoroughly testing DefaultTagHelperFactsService.GetTagHelperBinding because it's a pass through
-        // into TagHelperDescriptorProvider.GetTagHelperBinding.
-
-        [Fact]
-        public void GetTagHelperBinding_DoesNotAllowOptOutCharacterPrefix()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
-                    .Build()
-            };
-            var documentContext = TagHelperDocumentContext.Create(string.Empty, documentDescriptors);
-            var service = new DefaultTagHelperFactsService();
-
-            // Act
-            var binding = service.GetTagHelperBinding(documentContext, "!a", Enumerable.Empty<KeyValuePair<string, string>>(), parentTag: null, parentIsTagHelper: false);
-
-            // Assert
-            Assert.Null(binding);
-        }
-
-        [Fact]
-        public void GetTagHelperBinding_WorksAsExpected()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule =>
-                        rule
-                            .RequireTagName("a")
-                            .RequireAttributeDescriptor(attribute => attribute.Name("asp-for")))
-                    .BoundAttributeDescriptor(attribute =>
-                        attribute
-                            .Name("asp-for")
-                            .TypeName(typeof(string).FullName)
-                            .PropertyName("AspFor"))
-                    .BoundAttributeDescriptor(attribute =>
-                        attribute
-                            .Name("asp-route")
-                            .TypeName(typeof(IDictionary<string, string>).Namespace + "IDictionary<string, string>")
-                            .PropertyName("AspRoute")
-                            .AsDictionaryAttribute("asp-route-", typeof(string).FullName))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("input"))
-                    .BoundAttributeDescriptor(attribute =>
-                        attribute
-                            .Name("asp-for")
-                            .TypeName(typeof(string).FullName)
-                            .PropertyName("AspFor"))
-                    .Build(),
-            };
-            var documentContext = TagHelperDocumentContext.Create(string.Empty, documentDescriptors);
-            var service = new DefaultTagHelperFactsService();
-            var attributes = new[]
-            {
-                new KeyValuePair<string, string>("asp-for", "Name")
-            };
-
-            // Act
-            var binding = service.GetTagHelperBinding(documentContext, "a", attributes, parentTag: "p", parentIsTagHelper: false);
-
-            // Assert
-            var descriptor = Assert.Single(binding.Descriptors);
-            Assert.Equal(documentDescriptors[0], descriptor, TagHelperDescriptorComparer.CaseSensitive);
-            var boundRule = Assert.Single(binding.GetBoundRules(descriptor));
-            Assert.Equal(documentDescriptors[0].TagMatchingRules.First(), boundRule, TagMatchingRuleDescriptorComparer.CaseSensitive);
-        }
-
-        [Fact]
-        public void GetBoundTagHelperAttributes_MatchesPrefixedAttributeName()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("a"))
-                    .BoundAttributeDescriptor(attribute =>
-                        attribute
-                            .Name("asp-for")
-                            .TypeName(typeof(string).FullName)
-                            .PropertyName("AspFor"))
-                    .BoundAttributeDescriptor(attribute =>
-                        attribute
-                            .Name("asp-route")
-                            .TypeName(typeof(IDictionary<string, string>).Namespace + "IDictionary<string, string>")
-                            .PropertyName("AspRoute")
-                            .AsDictionaryAttribute("asp-route-", typeof(string).FullName))
-                    .Build()
-            };
-            var expectedAttributeDescriptors = new[]
-            {
-                documentDescriptors[0].BoundAttributes.Last()
-            };
-            var documentContext = TagHelperDocumentContext.Create(string.Empty, documentDescriptors);
-            var service = new DefaultTagHelperFactsService();
-            var binding = service.GetTagHelperBinding(documentContext, "a", Enumerable.Empty<KeyValuePair<string, string>>(), parentTag: null, parentIsTagHelper: false);
-
-            // Act
-            var descriptors = service.GetBoundTagHelperAttributes(documentContext, "asp-route-something", binding);
-
-            // Assert
-            Assert.Equal(expectedAttributeDescriptors, descriptors, BoundAttributeDescriptorComparer.CaseSensitive);
-        }
-
-        [Fact]
-        public void GetBoundTagHelperAttributes_MatchesAttributeName()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("input"))
-                    .BoundAttributeDescriptor(attribute =>
-                        attribute
-                            .Name("asp-for")
-                            .TypeName(typeof(string).FullName)
-                            .PropertyName("AspFor"))
-                    .BoundAttributeDescriptor(attribute =>
-                        attribute
-                            .Name("asp-extra")
-                            .TypeName(typeof(string).FullName)
-                            .PropertyName("AspExtra"))
-                    .Build()
-            };
-            var expectedAttributeDescriptors = new[]
-            {
-                documentDescriptors[0].BoundAttributes.First()
-            };
-            var documentContext = TagHelperDocumentContext.Create(string.Empty, documentDescriptors);
-            var service = new DefaultTagHelperFactsService();
-            var binding = service.GetTagHelperBinding(documentContext, "input", Enumerable.Empty<KeyValuePair<string, string>>(), parentTag: null, parentIsTagHelper: false);
-
-            // Act
-            var descriptors = service.GetBoundTagHelperAttributes(documentContext, "asp-for", binding);
-
-            // Assert
-            Assert.Equal(expectedAttributeDescriptors, descriptors, BoundAttributeDescriptorComparer.CaseSensitive);
-        }
-
-        [Fact]
-        public void GetTagHelpersGivenTag_DoesNotAllowOptOutCharacterPrefix()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
-                    .Build()
-            };
-            var documentContext = TagHelperDocumentContext.Create(string.Empty, documentDescriptors);
-            var service = new DefaultTagHelperFactsService();
-
-            // Act
-            var descriptors = service.GetTagHelpersGivenTag(documentContext, "!strong", parentTag: null);
-
-            // Assert
-            Assert.Empty(descriptors);
-        }
-
-        [Fact]
-        public void GetTagHelpersGivenTag_RequiresTagName()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("strong"))
-                    .Build()
-            };
-            var documentContext = TagHelperDocumentContext.Create(string.Empty, documentDescriptors);
-            var service = new DefaultTagHelperFactsService();
-
-            // Act
-            var descriptors = service.GetTagHelpersGivenTag(documentContext, "strong", "p");
-
-            // Assert
-            Assert.Equal(documentDescriptors, descriptors, TagHelperDescriptorComparer.CaseSensitive);
-        }
-
-        [Fact]
-        public void GetTagHelpersGivenTag_RestrictsTagHelpersBasedOnTagName()
-        {
-            // Arrange
-            var expectedDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
-                    .TagMatchingRuleDescriptor(
-                        rule => rule
-                            .RequireTagName("a")
-                            .RequireParentTag("div"))
-                    .Build()
-            };
-            var documentDescriptors = new[]
-            {
-                expectedDescriptors[0],
-                TagHelperDescriptorBuilder.Create("TestType2", "TestAssembly")
-                    .TagMatchingRuleDescriptor(
-                        rule => rule
-                            .RequireTagName("strong")
-                            .RequireParentTag("div"))
-                    .Build()
-            };
-            var documentContext = TagHelperDocumentContext.Create(string.Empty, documentDescriptors);
-            var service = new DefaultTagHelperFactsService();
-
-            // Act
-            var descriptors = service.GetTagHelpersGivenTag(documentContext, "a", "div");
-
-            // Assert
-            Assert.Equal(expectedDescriptors, descriptors, TagHelperDescriptorComparer.CaseSensitive);
-        }
-
-        [Fact]
-        public void GetTagHelpersGivenTag_RestrictsTagHelpersBasedOnTagHelperPrefix()
-        {
-            // Arrange
-            var expectedDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("strong"))
-                    .Build()
-            };
-            var documentDescriptors = new[]
-            {
-                expectedDescriptors[0],
-                TagHelperDescriptorBuilder.Create("TestType2", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("thstrong"))
-                    .Build()
-            };
-            var documentContext = TagHelperDocumentContext.Create("th", documentDescriptors);
-            var service = new DefaultTagHelperFactsService();
-
-            // Act
-            var descriptors = service.GetTagHelpersGivenTag(documentContext, "thstrong", "div");
-
-            // Assert
-            Assert.Equal(expectedDescriptors, descriptors, TagHelperDescriptorComparer.CaseSensitive);
-        }
-
-        [Fact]
-        public void GetTagHelpersGivenTag_RestrictsTagHelpersBasedOnParent()
-        {
-            // Arrange
-            var expectedDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
-                    .TagMatchingRuleDescriptor(
-                        rule => rule
-                            .RequireTagName("strong")
-                            .RequireParentTag("div"))
-                    .Build()
-            };
-            var documentDescriptors = new[]
-            {
-                expectedDescriptors[0],
-                TagHelperDescriptorBuilder.Create("TestType2", "TestAssembly")
-                    .TagMatchingRuleDescriptor(
-                        rule => rule
-                            .RequireTagName("strong")
-                            .RequireParentTag("p"))
-                    .Build()
-            };
-            var documentContext = TagHelperDocumentContext.Create(string.Empty, documentDescriptors);
-            var service = new DefaultTagHelperFactsService();
-
-            // Act
-            var descriptors = service.GetTagHelpersGivenTag(documentContext, "strong", "div");
-
-            // Assert
-            Assert.Equal(expectedDescriptors, descriptors, TagHelperDescriptorComparer.CaseSensitive);
-        }
-
-        [Fact]
-        public void GetTagHelpersGivenParent_AllowsRootParentTag()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
-                    .Build()
-            };
-            var documentContext = TagHelperDocumentContext.Create(string.Empty, documentDescriptors);
-            var service = new DefaultTagHelperFactsService();
-
-            // Act
-            var descriptors = service.GetTagHelpersGivenParent(documentContext, parentTag: null /* root */);
-
-            // Assert
-            Assert.Equal(documentDescriptors, descriptors, TagHelperDescriptorComparer.CaseSensitive);
-        }
-
-        [Fact]
-        public void GetTagHelpersGivenParent_AllowsRootParentTagForParentRestrictedTagHelperDescriptors()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("DivTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
-                    .Build(),
-                TagHelperDescriptorBuilder.Create("PTagHelper", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule
-                        .RequireTagName("p")
-                        .RequireParentTag("body"))
-                    .Build()
-            };
-            var documentContext = TagHelperDocumentContext.Create(string.Empty, documentDescriptors);
-            var service = new DefaultTagHelperFactsService();
-
-            // Act
-            var descriptors = service.GetTagHelpersGivenParent(documentContext, parentTag: null /* root */);
-
-            // Assert
-            var descriptor = Assert.Single(descriptors);
-            Assert.Equal(documentDescriptors[0], descriptor, TagHelperDescriptorComparer.CaseSensitive);
-        }
-
-        [Fact]
-        public void GetTagHelpersGivenParent_AllowsUnspecifiedParentTagHelpers()
-        {
-            // Arrange
-            var documentDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
-                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
-                    .Build()
-            };
-            var documentContext = TagHelperDocumentContext.Create(string.Empty, documentDescriptors);
-            var service = new DefaultTagHelperFactsService();
-
-            // Act
-            var descriptors = service.GetTagHelpersGivenParent(documentContext, "p");
-
-            // Assert
-            Assert.Equal(documentDescriptors, descriptors, TagHelperDescriptorComparer.CaseSensitive);
-        }
-
-        [Fact]
-        public void GetTagHelpersGivenParent_RestrictsTagHelpersBasedOnParent()
-        {
-            // Arrange
-            var expectedDescriptors = new[]
-            {
-                TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
-                    .TagMatchingRuleDescriptor(
-                        rule => rule
-                            .RequireTagName("p")
-                            .RequireParentTag("div"))
-                    .Build()
-            };
-            var documentDescriptors = new[]
-            {
-                expectedDescriptors[0],
-                TagHelperDescriptorBuilder.Create("TestType2", "TestAssembly")
-                    .TagMatchingRuleDescriptor(
-                        rule => rule
-                            .RequireTagName("strong")
-                            .RequireParentTag("p"))
-                    .Build()
-            };
-            var documentContext = TagHelperDocumentContext.Create(string.Empty, documentDescriptors);
-            var service = new DefaultTagHelperFactsService();
-
-            // Act
-            var descriptors = service.GetTagHelpersGivenParent(documentContext, "div");
-
-            // Assert
-            Assert.Equal(expectedDescriptors, descriptors, TagHelperDescriptorComparer.CaseSensitive);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultTextBufferCodeDocumentProviderTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultTextBufferCodeDocumentProviderTest.cs
deleted file mode 100644
index 8daedb4d7313..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultTextBufferCodeDocumentProviderTest.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Utilities;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultTextBufferCodeDocumentProviderTest
-    {
-        [Fact]
-        public void TryGetFromBuffer_SucceedsIfParserHasCodeDocument()
-        {
-            // Arrange
-            var expectedCodeDocument = TestRazorCodeDocument.Create("Hello World");
-            VisualStudioRazorParser parser = new DefaultVisualStudioRazorParser(expectedCodeDocument);
-            var properties = new PropertyCollection()
-            {
-                [typeof(VisualStudioRazorParser)] = parser
-            };
-            var textBuffer = Mock.Of<ITextBuffer>(buffer => buffer.Properties == properties);
-            var provider = new DefaultTextBufferCodeDocumentProvider();
-
-            // Act
-            var result = provider.TryGetFromBuffer(textBuffer, out var codeDocument);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(expectedCodeDocument, codeDocument);
-        }
-
-        [Fact]
-        public void TryGetFromBuffer_FailsIfParserMissingCodeDocument()
-        {
-            // Arrange
-            VisualStudioRazorParser parser = new DefaultVisualStudioRazorParser(codeDocument: null);
-            var properties = new PropertyCollection()
-            {
-                [typeof(VisualStudioRazorParser)] = parser
-            };
-            var textBuffer = Mock.Of<ITextBuffer>(buffer => buffer.Properties == properties);
-            var provider = new DefaultTextBufferCodeDocumentProvider();
-
-            // Act
-            var result = provider.TryGetFromBuffer(textBuffer, out var codeDocument);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(codeDocument);
-        }
-
-        [Fact]
-        public void TryGetFromBuffer_FailsIfNoParserIsAvailable()
-        {
-            // Arrange
-            var textBuffer = Mock.Of<ITextBuffer>(buffer => buffer.Properties == new PropertyCollection());
-            var provider = new DefaultTextBufferCodeDocumentProvider();
-
-            // Act
-            var result = provider.TryGetFromBuffer(textBuffer, out var codeDocument);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(codeDocument);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultTextBufferProviderTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultTextBufferProviderTest.cs
deleted file mode 100644
index fef720a47ec3..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultTextBufferProviderTest.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.ObjectModel;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Projection;
-using Microsoft.VisualStudio.Utilities;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultTextBufferProviderTest
-    {
-        [Fact]
-        public void TryGetFromDocument_ReturnsFalseIfCannotExtractSourceText()
-        {
-            // Arrange
-            var textBuffer = CreateTextBuffer();
-            var bufferGraphService = CreateBufferGraphService(textBuffer);
-            var document = CreateDocumentWithoutText();
-            var bufferProvider = new DefaultTextBufferProvider(bufferGraphService);
-
-            // Act
-            var result = bufferProvider.TryGetFromDocument(document, out var buffer);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(buffer);
-        }
-
-        [Fact]
-        public void TryGetFromDocument_ReturnsFalseIfSourceContainerNotConstructedFromTextBuffer()
-        {
-            // Arrange
-            var bufferGraphService = CreateBufferGraphService(null);
-            var text = SourceText.From("Hello World");
-            var document = CreateDocumentWithoutText();
-            document = document.WithText(text);
-            var bufferProvider = new DefaultTextBufferProvider(bufferGraphService);
-
-            // Act
-            var result = bufferProvider.TryGetFromDocument(document, out var buffer);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(buffer);
-        }
-
-        [Fact]
-        public void TryGetFromDocument_ReturnsFalseIfBufferGraphCanNotFindRazorBuffer()
-        {
-            // Arrange
-            var textBuffer = CreateTextBuffer();
-            var bufferGraph = new Mock<IBufferGraph>();
-            bufferGraph.Setup(graph => graph.GetTextBuffers(It.IsAny<Predicate<ITextBuffer>>()))
-                .Returns(new Collection<ITextBuffer>());
-            var bufferGraphService = new Mock<IBufferGraphFactoryService>();
-            bufferGraphService.Setup(service => service.CreateBufferGraph(textBuffer))
-                .Returns(bufferGraph.Object);
-            var document = CreateDocument(textBuffer);
-            var bufferProvider = new DefaultTextBufferProvider(bufferGraphService.Object);
-
-            // Act
-            var result = bufferProvider.TryGetFromDocument(document, out var buffer);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(buffer);
-        }
-
-        [Fact]
-        public void TryGetFromDocument_ReturnsTrueForValidDocuments()
-        {
-            // Arrange
-            var textBuffer = CreateTextBuffer();
-            var bufferGraphService = CreateBufferGraphService(textBuffer);
-            var document = CreateDocument(textBuffer);
-            var bufferProvider = new DefaultTextBufferProvider(bufferGraphService);
-
-            // Act
-            var result = bufferProvider.TryGetFromDocument(document, out var buffer);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(textBuffer, buffer);
-        }
-
-        private static Document CreateDocumentWithoutText()
-        {
-            Document document = null;
-            TestWorkspace.Create(workspace =>
-            {
-                var project = ProjectInfo
-                    .Create(ProjectId.CreateNewId(), VersionStamp.Default, "TestProject", "TestAssembly", LanguageNames.CSharp)
-                    .WithFilePath("/TestProject.csproj");
-                workspace.AddProject(project);
-                var documentInfo = DocumentInfo.Create(DocumentId.CreateNewId(project.Id), "Test.cshtml");
-                document = workspace.AddDocument(documentInfo);
-            });
-
-            return document;
-        }
-
-        private static Document CreateDocument(ITextBuffer buffer)
-        {
-            var document = CreateDocumentWithoutText();
-            var container = buffer.AsTextContainer();
-            document = document.WithText(container.CurrentText);
-            return document;
-        }
-
-        private static ITextBuffer CreateTextBuffer()
-        {
-            var textBuffer = new Mock<ITextBuffer>();
-            textBuffer.Setup(buffer => buffer.Properties)
-                .Returns(new PropertyCollection());
-
-            var textImage = new Mock<ITextImage>();
-            var textVersion = new Mock<ITextVersion>();
-            var textBufferSnapshot = new Mock<ITextSnapshot2>();
-            textBufferSnapshot.Setup(snapshot => snapshot.TextImage)
-                .Returns(textImage.Object);
-            textBufferSnapshot.Setup(snapshot => snapshot.Length)
-                .Returns(0);
-            textBufferSnapshot.Setup(snapshot => snapshot.Version)
-                .Returns(textVersion.Object);
-            textBufferSnapshot.Setup(snapshot => snapshot.TextBuffer)
-                .Returns(() => textBuffer.Object);
-
-            textBuffer.Setup(buffer => buffer.CurrentSnapshot)
-                .Returns(() => textBufferSnapshot.Object);
-
-            var contentType = new Mock<IContentType>();
-            contentType.Setup(type => type.IsOfType(It.IsAny<string>()))
-                .Returns<string>(val => val == RazorLanguage.CoreContentType);
-            textBuffer.Setup(buffer => buffer.ContentType)
-                .Returns(contentType.Object);
-
-            return textBuffer.Object;
-        }
-
-        private static IBufferGraphFactoryService CreateBufferGraphService(ITextBuffer buffer)
-        {
-            var bufferGraph = new Mock<IBufferGraph>();
-            bufferGraph.Setup(graph => graph.GetTextBuffers(It.IsAny<Predicate<ITextBuffer>>()))
-                .Returns<Predicate<ITextBuffer>>(predicate => predicate(buffer) ? new Collection<ITextBuffer>() { buffer } : new Collection<ITextBuffer>());
-            var bufferGraphService = new Mock<IBufferGraphFactoryService>();
-            bufferGraphService.Setup(service => service.CreateBufferGraph(buffer))
-                .Returns(bufferGraph.Object);
-
-            return bufferGraphService.Object;
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioDocumentTrackerTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioDocumentTrackerTest.cs
deleted file mode 100644
index 352c49ecc3c9..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioDocumentTrackerTest.cs
+++ /dev/null
@@ -1,560 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.Editor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Editor.Razor.Documents;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.Utilities;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultVisualStudioDocumentTrackerTest : ForegroundDispatcherTestBase
-    {
-        public DefaultVisualStudioDocumentTrackerTest()
-        {
-            RazorCoreContentType = Mock.Of<IContentType>(c => c.IsOfType(RazorLanguage.ContentType) == true);
-            TextBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType);
-
-            FilePath = "C:/Some/Path/TestDocumentTracker.cshtml";
-            ProjectPath = "C:/Some/Path/TestProject.csproj";
-
-            ImportDocumentManager = Mock.Of<ImportDocumentManager>();
-            WorkspaceEditorSettings = new DefaultWorkspaceEditorSettings(Mock.Of<ForegroundDispatcher>(), Mock.Of<EditorSettingsManager>());
-
-            TagHelperResolver = new TestTagHelperResolver();
-            SomeTagHelpers = new List<TagHelperDescriptor>()
-            {
-                TagHelperDescriptorBuilder.Create("test", "test").Build(),
-            };
-
-            HostServices = TestServices.Create(
-                new IWorkspaceService[] { },
-                new ILanguageService[] { TagHelperResolver, });
-
-            Workspace = TestWorkspace.Create(HostServices, w =>
-            {
-                WorkspaceProject = w.AddProject(ProjectInfo.Create(
-                    ProjectId.CreateNewId(),
-                    new VersionStamp(),
-                    "Test1",
-                    "TestAssembly",
-                    LanguageNames.CSharp,
-                    filePath: ProjectPath));
-            });
-
-            ProjectManager = new TestProjectSnapshotManager(Dispatcher, Workspace) { AllowNotifyListeners = true };
-
-            HostProject = new HostProject(ProjectPath, FallbackRazorConfiguration.MVC_2_1);
-            OtherHostProject = new HostProject(ProjectPath, FallbackRazorConfiguration.MVC_2_0);
-
-            DocumentTracker = new DefaultVisualStudioDocumentTracker(
-                Dispatcher,
-                FilePath,
-                ProjectPath,
-                ProjectManager,
-                WorkspaceEditorSettings,
-                Workspace,
-                TextBuffer,
-                ImportDocumentManager);
-        }
-
-        private IContentType RazorCoreContentType { get; }
-
-        private ITextBuffer TextBuffer { get; }
-
-        private string FilePath { get; }
-
-        private string ProjectPath { get; }
-
-        private HostProject HostProject { get; }
-
-        private HostProject OtherHostProject { get; }
-
-        private Project WorkspaceProject { get; set; }
-
-        private ImportDocumentManager ImportDocumentManager { get; }
-
-        private WorkspaceEditorSettings WorkspaceEditorSettings { get; }
-
-        private List<TagHelperDescriptor> SomeTagHelpers { get; }
-
-        private TestTagHelperResolver TagHelperResolver { get; }
-
-        private ProjectSnapshotManagerBase ProjectManager { get; }
-
-        private HostServices HostServices { get; }
-
-        private Workspace Workspace { get; }
-
-        private DefaultVisualStudioDocumentTracker DocumentTracker { get; }
-
-        [ForegroundFact]
-        public void Subscribe_NoopsIfAlreadySubscribed()
-        {
-            // Arrange
-            var callCount = 0;
-            DocumentTracker.ContextChanged += (sender, args) =>
-            {
-                callCount++;
-            };
-            DocumentTracker.Subscribe();
-
-            // Call count is 2 right now:
-            // 1 trigger for initial subscribe context changed.
-            // 1 trigger for TagHelpers being changed (computed).
-
-            // Act
-            DocumentTracker.Subscribe();
-
-            // Assert
-            Assert.Equal(2, callCount);
-        }
-
-        [ForegroundFact]
-        public void Unsubscribe_NoopsIfAlreadyUnsubscribed()
-        {
-            // Arrange
-            var callCount = 0;
-            DocumentTracker.Subscribe();
-            DocumentTracker.ContextChanged += (sender, args) =>
-            {
-                callCount++;
-            };
-            DocumentTracker.Unsubscribe();
-
-            // Act
-            DocumentTracker.Unsubscribe();
-
-            // Assert
-            Assert.Equal(1, callCount);
-        }
-
-        [ForegroundFact]
-        public void Unsubscribe_NoopsIfSubscribeHasBeenCalledMultipleTimes()
-        {
-            // Arrange
-            var callCount = 0;
-            DocumentTracker.Subscribe();
-            DocumentTracker.Subscribe();
-            DocumentTracker.ContextChanged += (sender, args) =>
-            {
-                callCount++;
-            };
-
-            // Act - 1
-            DocumentTracker.Unsubscribe();
-
-            // Assert - 1
-            Assert.Equal(0, callCount);
-
-            // Act - 2
-            DocumentTracker.Unsubscribe();
-
-            // Assert - 2
-            Assert.Equal(1, callCount);
-        }
-
-        [ForegroundFact]
-        public void EditorSettingsManager_Changed_TriggersContextChanged()
-        {
-            // Arrange
-            var called = false;
-            DocumentTracker.ContextChanged += (sender, args) =>
-            {
-                Assert.Equal(ContextChangeKind.EditorSettingsChanged, args.Kind);
-                called = true;
-                Assert.Equal(ContextChangeKind.EditorSettingsChanged, args.Kind);
-            };
-
-            // Act
-            DocumentTracker.EditorSettingsManager_Changed(null, null);
-
-            // Assert
-            Assert.True(called);
-        }
-
-        [ForegroundFact]
-        public void ProjectManager_Changed_ProjectAdded_TriggersContextChanged()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-
-            var e = new ProjectChangeEventArgs(ProjectPath, ProjectChangeKind.ProjectAdded);
-
-            var called = false;
-            DocumentTracker.ContextChanged += (sender, args) =>
-            {
-                Assert.Equal(ContextChangeKind.ProjectChanged, args.Kind);
-                called = true;
-
-                Assert.Same(ProjectManager.GetLoadedProject(DocumentTracker.ProjectPath), DocumentTracker.ProjectSnapshot);
-            };
-
-            // Act
-            DocumentTracker.ProjectManager_Changed(ProjectManager, e);
-
-            // Assert
-            Assert.True(called);
-        }
-
-        [ForegroundFact]
-        public void ProjectManager_Changed_ProjectChanged_TriggersContextChanged()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-
-            var e = new ProjectChangeEventArgs(ProjectPath, ProjectChangeKind.ProjectChanged);
-
-            var called = false;
-            DocumentTracker.ContextChanged += (sender, args) =>
-            {
-                Assert.Equal(ContextChangeKind.ProjectChanged, args.Kind);
-                called = true;
-
-                Assert.Same(ProjectManager.GetLoadedProject(DocumentTracker.ProjectPath), DocumentTracker.ProjectSnapshot);
-            };
-
-            // Act
-            DocumentTracker.ProjectManager_Changed(ProjectManager, e);
-
-            // Assert
-            Assert.True(called);
-        }
-
-        [ForegroundFact]
-        public void ProjectManager_Changed_ProjectRemoved_TriggersContextChanged_WithEphemeralProject()
-        {
-            // Arrange
-            var e = new ProjectChangeEventArgs(ProjectPath, ProjectChangeKind.ProjectRemoved);
-
-            var called = false;
-            DocumentTracker.ContextChanged += (sender, args) =>
-            {
-                // This can be called both with tag helper and project changes.
-                called = true;
-
-                Assert.IsType<EphemeralProjectSnapshot>(DocumentTracker.ProjectSnapshot);
-            };
-
-            // Act
-            DocumentTracker.ProjectManager_Changed(ProjectManager, e);
-
-            // Assert
-            Assert.True(called);
-        }
-
-        [ForegroundFact]
-        public void ProjectManager_Changed_IgnoresUnknownProject()
-        {
-            // Arrange
-            var e = new ProjectChangeEventArgs("c:/OtherPath/OtherProject.csproj", ProjectChangeKind.ProjectChanged);
-
-            var called = false;
-            DocumentTracker.ContextChanged += (sender, args) =>
-            {
-                called = true;
-            };
-
-            // Act
-            DocumentTracker.ProjectManager_Changed(ProjectManager, e);
-
-            // Assert
-            Assert.False(called);
-        }
-
-        [ForegroundFact]
-        public void Import_Changed_ImportAssociatedWithDocument_TriggersContextChanged()
-        {
-            // Arrange
-            var called = false;
-            DocumentTracker.ContextChanged += (sender, args) =>
-            {
-                Assert.Equal(ContextChangeKind.ImportsChanged, args.Kind);
-                called = true;
-            };
-
-            var importChangedArgs = new ImportChangedEventArgs("path/to/import", FileChangeKind.Changed, new[] { FilePath });
-
-            // Act
-            DocumentTracker.Import_Changed(null, importChangedArgs);
-
-            // Assert
-            Assert.True(called);
-        }
-
-        [ForegroundFact]
-        public void Import_Changed_UnrelatedImport_DoesNothing()
-        {
-            // Arrange
-            DocumentTracker.ContextChanged += (sender, args) =>
-            {
-                throw new InvalidOperationException();
-            };
-
-            var importChangedArgs = new ImportChangedEventArgs("path/to/import", FileChangeKind.Changed, new[] { "path/to/differentfile" });
-
-            // Act & Assert (Does not throw)
-            DocumentTracker.Import_Changed(null, importChangedArgs);
-        }
-
-        [ForegroundFact]
-        public void Subscribe_SetsSupportedProjectAndTriggersContextChanged()
-        {
-            // Arrange
-            var called = false;
-            DocumentTracker.ContextChanged += (sender, args) =>
-            {
-                called = true; // This will trigger both ContextChanged and TagHelprsChanged
-            };
-
-            // Act
-            DocumentTracker.Subscribe();
-
-            // Assert
-            Assert.True(called);
-            Assert.True(DocumentTracker.IsSupportedProject);
-        }
-
-        [ForegroundFact]
-        public void Unsubscribe_ResetsSupportedProjectAndTriggersContextChanged()
-        {
-            // Arrange
-
-            // Subscribe once to set supported project
-            DocumentTracker.Subscribe();
-
-            var called = false;
-            DocumentTracker.ContextChanged += (sender, args) =>
-            {
-                called = true;
-                Assert.Equal(ContextChangeKind.ProjectChanged, args.Kind);
-            };
-
-            // Act
-            DocumentTracker.Unsubscribe();
-
-            // Assert
-            Assert.False(DocumentTracker.IsSupportedProject);
-            Assert.True(called);
-        }
-
-        [ForegroundFact]
-        public void AddTextView_AddsToTextViewCollection()
-        {
-            // Arrange
-            var textView = Mock.Of<ITextView>();
-
-            // Act
-            DocumentTracker.AddTextView(textView);
-
-            // Assert
-            Assert.Collection(DocumentTracker.TextViews, v => Assert.Same(v, textView));
-        }
-
-        [ForegroundFact]
-        public void AddTextView_DoesNotAddDuplicateTextViews()
-        {
-            // Arrange
-            var textView = Mock.Of<ITextView>();
-
-            // Act
-            DocumentTracker.AddTextView(textView);
-            DocumentTracker.AddTextView(textView);
-
-            // Assert
-            Assert.Collection(DocumentTracker.TextViews, v => Assert.Same(v, textView));
-        }
-
-        [ForegroundFact]
-        public void AddTextView_AddsMultipleTextViewsToCollection()
-        {
-            // Arrange
-            var textView1 = Mock.Of<ITextView>();
-            var textView2 = Mock.Of<ITextView>();
-
-            // Act
-            DocumentTracker.AddTextView(textView1);
-            DocumentTracker.AddTextView(textView2);
-
-            // Assert
-            Assert.Collection(
-                DocumentTracker.TextViews,
-                v => Assert.Same(v, textView1),
-                v => Assert.Same(v, textView2));
-        }
-
-        [ForegroundFact]
-        public void RemoveTextView_RemovesTextViewFromCollection_SingleItem()
-        {
-            // Arrange
-            var textView = Mock.Of<ITextView>();
-            DocumentTracker.AddTextView(textView);
-
-            // Act
-            DocumentTracker.RemoveTextView(textView);
-
-            // Assert
-            Assert.Empty(DocumentTracker.TextViews);
-        }
-
-        [ForegroundFact]
-        public void RemoveTextView_RemovesTextViewFromCollection_MultipleItems()
-        {
-            // Arrange
-            var textView1 = Mock.Of<ITextView>();
-            var textView2 = Mock.Of<ITextView>();
-            var textView3 = Mock.Of<ITextView>();
-            DocumentTracker.AddTextView(textView1);
-            DocumentTracker.AddTextView(textView2);
-            DocumentTracker.AddTextView(textView3);
-
-            // Act
-            DocumentTracker.RemoveTextView(textView2);
-
-            // Assert
-            Assert.Collection(
-                DocumentTracker.TextViews,
-                v => Assert.Same(v, textView1),
-                v => Assert.Same(v, textView3));
-        }
-
-        [ForegroundFact]
-        public void RemoveTextView_NoopsWhenRemovingTextViewNotInCollection()
-        {
-            // Arrange
-            var textView1 = Mock.Of<ITextView>();
-            DocumentTracker.AddTextView(textView1);
-            var textView2 = Mock.Of<ITextView>();
-
-            // Act
-            DocumentTracker.RemoveTextView(textView2);
-
-            // Assert
-            Assert.Collection(DocumentTracker.TextViews, v => Assert.Same(v, textView1));
-        }
-
-
-        [ForegroundFact]
-        public void Subscribed_InitializesEphemeralProjectSnapshot()
-        {
-            // Arrange
-
-            // Act
-            DocumentTracker.Subscribe();
-
-            // Assert
-            Assert.IsType<EphemeralProjectSnapshot>(DocumentTracker.ProjectSnapshot);
-        }
-
-        [ForegroundFact]
-        public void Subscribed_InitializesRealProjectSnapshot()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-
-            // Act
-            DocumentTracker.Subscribe();
-
-            // Assert
-            Assert.IsType<DefaultProjectSnapshot>(DocumentTracker.ProjectSnapshot);
-        }
-
-        [ForegroundFact]
-        public async Task Subscribed_ListensToProjectChanges()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-
-            DocumentTracker.Subscribe();
-
-            await DocumentTracker.PendingTagHelperTask;
-
-            // There can be multiple args here because the tag helpers will return
-            // immediately and trigger another ContextChanged.
-            List<ContextChangeEventArgs> args = new List<ContextChangeEventArgs>();
-            DocumentTracker.ContextChanged += (sender, e) => { args.Add(e); };
-            
-            // Act
-            ProjectManager.HostProjectChanged(OtherHostProject);
-            await DocumentTracker.PendingTagHelperTask;
-
-            // Assert
-            var snapshot = Assert.IsType<DefaultProjectSnapshot>(DocumentTracker.ProjectSnapshot);
-
-            Assert.Same(OtherHostProject, snapshot.HostProject);
-
-            Assert.Collection(
-                args,
-                e => Assert.Equal(ContextChangeKind.ProjectChanged, e.Kind),
-                e => Assert.Equal(ContextChangeKind.TagHelpersChanged, e.Kind));
-        }
-
-        [ForegroundFact]
-        public async Task Subscribed_ListensToProjectRemoval()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-
-            DocumentTracker.Subscribe();
-
-            await DocumentTracker.PendingTagHelperTask;
-
-            List<ContextChangeEventArgs> args = new List<ContextChangeEventArgs>();
-            DocumentTracker.ContextChanged += (sender, e) => { args.Add(e); };
-
-            // Act
-            ProjectManager.HostProjectRemoved(HostProject);
-            await DocumentTracker.PendingTagHelperTask;
-
-            // Assert
-            Assert.IsType<EphemeralProjectSnapshot>(DocumentTracker.ProjectSnapshot);
-
-            Assert.Collection(
-                args,
-                e => Assert.Equal(ContextChangeKind.ProjectChanged, e.Kind),
-                e => Assert.Equal(ContextChangeKind.TagHelpersChanged, e.Kind));
-        }
-
-        [ForegroundFact]
-        public async Task Subscribed_ListensToProjectChanges_ComputesTagHelpers()
-        {
-            // Arrange
-            TagHelperResolver.CompletionSource = new TaskCompletionSource<TagHelperResolutionResult>();
-
-            ProjectManager.HostProjectAdded(HostProject);
-
-            DocumentTracker.Subscribe();
-
-            // We haven't let the tag helpers complete yet
-            Assert.False(DocumentTracker.PendingTagHelperTask.IsCompleted);
-            Assert.Empty(DocumentTracker.TagHelpers);
-
-            List<ContextChangeEventArgs> args = new List<ContextChangeEventArgs>();
-            DocumentTracker.ContextChanged += (sender, e) => { args.Add(e); };
-
-            // Act
-            TagHelperResolver.CompletionSource.SetResult(new TagHelperResolutionResult(SomeTagHelpers, Array.Empty<RazorDiagnostic>()));
-            await DocumentTracker.PendingTagHelperTask;
-
-            // Assert
-            Assert.Same(DocumentTracker.TagHelpers, SomeTagHelpers);
-
-            Assert.Collection(
-                args,
-                e => Assert.Equal(ContextChangeKind.TagHelpersChanged, e.Kind));
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioRazorParserIntegrationTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioRazorParserIntegrationTest.cs
deleted file mode 100644
index 22bad6622c56..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioRazorParserIntegrationTest.cs
+++ /dev/null
@@ -1,785 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Razor.Extensions;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Test;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultVisualStudioRazorParserIntegrationTest : ForegroundDispatcherTestBase
-    {
-        private const string TestLinePragmaFileName = "C:\\This\\Path\\Is\\Just\\For\\Line\\Pragmas.cshtml";
-        private const string TestProjectPath = "C:\\This\\Path\\Is\\Just\\For\\Project.csproj";
-
-        public DefaultVisualStudioRazorParserIntegrationTest()
-        {
-            Workspace = TestWorkspace.Create();
-            ProjectSnapshot = new EphemeralProjectSnapshot(Workspace.Services, TestProjectPath);
-        }
-
-        private ProjectSnapshot ProjectSnapshot { get; }
-
-        private Workspace Workspace { get; }
-
-        [ForegroundFact]
-        public async Task BufferChangeStartsFullReparseIfChangeOverlapsMultipleSpans()
-        {
-            // Arrange
-            var original = new StringTextSnapshot("Foo @bar Baz");
-            var testBuffer = new TestTextBuffer(original);
-            var documentTracker = CreateDocumentTracker(testBuffer);
-            using (var manager = CreateParserManager(original))
-            {
-                var changed = new StringTextSnapshot("Foo @bap Daz");
-                var edit = new TestEdit(7, 3, original, 3, changed, "p D");
-
-                await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
-
-                // Act - 1
-                await manager.ApplyEditAndWaitForParseAsync(edit);
-
-                // Assert - 1
-                Assert.Equal(2, manager.ParseCount);
-
-                // Act - 2
-                await manager.ApplyEditAndWaitForParseAsync(edit);
-
-                // Assert - 2
-                Assert.Equal(3, manager.ParseCount);
-            }
-        }
-
-        [ForegroundFact]
-        public async Task AwaitPeriodInsertionAcceptedProvisionally()
-        {
-            // Arrange
-            var original = new StringTextSnapshot("foo @await Html baz");
-            using (var manager = CreateParserManager(original))
-            {
-                var factory = new SpanFactory();
-                var changed = new StringTextSnapshot("foo @await Html. baz");
-                var edit = new TestEdit(15, 0, original, 1, changed, ".");
-                await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
-
-                // Act
-                await manager.ApplyEditAndWaitForReparseAsync(edit);
-
-                // Assert
-                Assert.Equal(2, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(manager.CurrentSyntaxTree.Root, new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("await Html").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.WhiteSpace | AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(". baz")));
-            }
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionAcceptsDotlessCommitInsertionsInStatementBlockAfterIdentifiers()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("@{" + Environment.NewLine
-                                                + "    @DateTime." + Environment.NewLine
-                                                + "}");
-            var original = new StringTextSnapshot("@{" + Environment.NewLine
-                                            + "    @DateTime" + Environment.NewLine
-                                            + "}");
-
-            var edit = new TestEdit(15 + Environment.NewLine.Length, 0, original, 1, changed, ".");
-            using (var manager = CreateParserManager(original))
-            {
-                void ApplyAndVerifyPartialChange(TestEdit testEdit, string expectedCode)
-                {
-                    manager.ApplyEdit(testEdit);
-                    Assert.Equal(1, manager.ParseCount);
-                    ParserTestBase.EvaluateParseTree(manager.PartialParsingSyntaxTreeRoot, new MarkupBlock(
-                        factory.EmptyHtml(),
-                        new StatementBlock(
-                            factory.CodeTransition(),
-                            factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                            factory.Code(Environment.NewLine + "    ")
-                                .AsStatement()
-                                .AutoCompleteWith(autoCompleteString: null),
-                            new ExpressionBlock(
-                                factory.CodeTransition(),
-                                factory.Code(expectedCode)
-                                       .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                       .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                            factory.Code(Environment.NewLine).AsStatement(),
-                            factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                        factory.EmptyHtml()));
-                };
-
-                await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
-
-                // This is the process of a dotless commit when doing "." insertions to commit intellisense changes.
-                ApplyAndVerifyPartialChange(edit, "DateTime.");
-
-                original = changed;
-                changed = new StringTextSnapshot("@{" + Environment.NewLine
-                                                + "    @DateTime.." + Environment.NewLine
-                                                + "}");
-                edit = new TestEdit(16 + Environment.NewLine.Length, 0, original, 1, changed, ".");
-
-                ApplyAndVerifyPartialChange(edit, "DateTime..");
-
-                original = changed;
-                changed = new StringTextSnapshot("@{" + Environment.NewLine
-                                                + "    @DateTime.Now." + Environment.NewLine
-                                                + "}");
-                edit = new TestEdit(16 + Environment.NewLine.Length, 0, original, 3, changed, "Now");
-
-                ApplyAndVerifyPartialChange(edit, "DateTime.Now.");
-            }
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionAcceptsDotlessCommitInsertionsInStatementBlock()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("@{" + Environment.NewLine
-                                                    + "    @DateT." + Environment.NewLine
-                                                    + "}");
-            var original = new StringTextSnapshot("@{" + Environment.NewLine
-                                            + "    @DateT" + Environment.NewLine
-                                            + "}");
-
-            var edit = new TestEdit(12 + Environment.NewLine.Length, 0, original, 1, changed, ".");
-            using (var manager = CreateParserManager(original))
-            {
-                void ApplyAndVerifyPartialChange(TestEdit testEdit, string expectedCode)
-                {
-                    manager.ApplyEdit(testEdit);
-                    Assert.Equal(1, manager.ParseCount);
-                    ParserTestBase.EvaluateParseTree(manager.PartialParsingSyntaxTreeRoot, new MarkupBlock(
-                        factory.EmptyHtml(),
-                        new StatementBlock(
-                            factory.CodeTransition(),
-                            factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                            factory.Code(Environment.NewLine + "    ")
-                                .AsStatement()
-                                .AutoCompleteWith(autoCompleteString: null),
-                            new ExpressionBlock(
-                                factory.CodeTransition(),
-                                factory.Code(expectedCode)
-                                       .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                       .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                            factory.Code(Environment.NewLine).AsStatement(),
-                            factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                        factory.EmptyHtml()));
-                };
-
-                await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
-
-                // This is the process of a dotless commit when doing "." insertions to commit intellisense changes.
-                ApplyAndVerifyPartialChange(edit, "DateT.");
-
-                original = changed;
-                changed = new StringTextSnapshot("@{" + Environment.NewLine
-                                                + "    @DateTime." + Environment.NewLine
-                                                + "}");
-                edit = new TestEdit(12 + Environment.NewLine.Length, 0, original, 3, changed, "ime");
-
-                ApplyAndVerifyPartialChange(edit, "DateTime.");
-            }
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionProvisionallyAcceptsDotlessCommitInsertions()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("foo @DateT. baz");
-            var original = new StringTextSnapshot("foo @DateT baz");
-            var edit = new TestEdit(10, 0, original, 1, changed, ".");
-            using (var manager = CreateParserManager(original))
-            {
-                void ApplyAndVerifyPartialChange(TestEdit testEdit, string expectedCode)
-                {
-                    manager.ApplyEdit(testEdit);
-                    Assert.Equal(1, manager.ParseCount);
-
-                    ParserTestBase.EvaluateParseTree(manager.PartialParsingSyntaxTreeRoot, new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code(expectedCode).AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(" baz")));
-                };
-
-                await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
-
-                // This is the process of a dotless commit when doing "." insertions to commit intellisense changes.
-                ApplyAndVerifyPartialChange(edit, "DateT.");
-
-                original = changed;
-                changed = new StringTextSnapshot("foo @DateTime. baz");
-                edit = new TestEdit(10, 0, original, 3, changed, "ime");
-
-                ApplyAndVerifyPartialChange(edit, "DateTime.");
-
-                // Verify the reparse finally comes
-                await manager.WaitForReparseAsync();
-
-                Assert.Equal(2, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(manager.CurrentSyntaxTree.Root, new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("DateTime").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(". baz")));
-            }
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionProvisionallyAcceptsDotlessCommitInsertionsAfterIdentifiers()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("foo @DateTime. baz");
-            var original = new StringTextSnapshot("foo @DateTime baz");
-            var edit = new TestEdit(13, 0, original, 1, changed, ".");
-            using (var manager = CreateParserManager(original))
-            {
-                void ApplyAndVerifyPartialChange(TestEdit testEdit, string expectedCode)
-                {
-                    manager.ApplyEdit(testEdit);
-                    Assert.Equal(1, manager.ParseCount);
-
-                    ParserTestBase.EvaluateParseTree(manager.PartialParsingSyntaxTreeRoot, new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code(expectedCode).AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(" baz")));
-                };
-
-                await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
-
-                // This is the process of a dotless commit when doing "." insertions to commit intellisense changes.
-                ApplyAndVerifyPartialChange(edit, "DateTime.");
-
-                original = changed;
-                changed = new StringTextSnapshot("foo @DateTime.. baz");
-                edit = new TestEdit(14, 0, original, 1, changed, ".");
-
-                ApplyAndVerifyPartialChange(edit, "DateTime..");
-
-                original = changed;
-                changed = new StringTextSnapshot("foo @DateTime.Now. baz");
-                edit = new TestEdit(14, 0, original, 3, changed, "Now");
-
-                ApplyAndVerifyPartialChange(edit, "DateTime.Now.");
-
-                // Verify the reparse eventually happens
-                await manager.WaitForReparseAsync();
-
-                Assert.Equal(2, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(manager.CurrentSyntaxTree.Root, new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("DateTime.Now").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(". baz")));
-            }
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionProvisionallyAcceptsCaseInsensitiveDotlessCommitInsertions_NewRoslynIntegration()
-        {
-            var factory = new SpanFactory();
-            var original = new StringTextSnapshot("foo @date baz");
-            var changed = new StringTextSnapshot("foo @date. baz");
-            var edit = new TestEdit(9, 0, original, 1, changed, ".");
-            using (var manager = CreateParserManager(original))
-            {
-                void ApplyAndVerifyPartialChange(Action applyEdit, string expectedCode)
-                {
-                    applyEdit();
-                    Assert.Equal(1, manager.ParseCount);
-
-                    ParserTestBase.EvaluateParseTree(manager.PartialParsingSyntaxTreeRoot, new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code(expectedCode).AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(" baz")));
-                };
-
-                await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
-
-                // This is the process of a dotless commit when doing "." insertions to commit intellisense changes.
-
-                // @date => @date.
-                ApplyAndVerifyPartialChange(() => manager.ApplyEdit(edit), "date.");
-
-                original = changed;
-                changed = new StringTextSnapshot("foo @date baz");
-                edit = new TestEdit(9, 1, original, 0, changed, "");
-
-                // @date. => @date
-                ApplyAndVerifyPartialChange(() => manager.ApplyEdit(edit), "date");
-
-                original = changed;
-                changed = new StringTextSnapshot("foo @DateTime baz");
-                edit = new TestEdit(5, 4, original, 8, changed, "DateTime");
-
-                // @date => @DateTime
-                ApplyAndVerifyPartialChange(() => manager.ApplyEdit(edit), "DateTime");
-
-                original = changed;
-                changed = new StringTextSnapshot("foo @DateTime. baz");
-                edit = new TestEdit(13, 0, original, 1, changed, ".");
-
-                // @DateTime => @DateTime.
-                ApplyAndVerifyPartialChange(() => manager.ApplyEdit(edit), "DateTime.");
-
-                // Verify the reparse eventually happens
-                await manager.WaitForReparseAsync();
-
-                Assert.Equal(2, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(manager.CurrentSyntaxTree.Root, new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(". baz")));
-            }
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionRejectsChangeWhichWouldHaveBeenAcceptedIfLastChangeWasProvisionallyAcceptedOnDifferentSpan()
-        {
-            // Arrange
-            var factory = new SpanFactory();
-            var dotTyped = new TestEdit(8, 0, new StringTextSnapshot("foo @foo @bar"), 1, new StringTextSnapshot("foo @foo. @bar"), ".");
-            var charTyped = new TestEdit(14, 0, new StringTextSnapshot("foo @foo. @bar"), 1, new StringTextSnapshot("foo @foo. @barb"), "b");
-            using (var manager = CreateParserManager(dotTyped.OldSnapshot))
-            {
-                await manager.InitializeWithDocumentAsync(dotTyped.OldSnapshot);
-
-                // Apply the dot change
-                await manager.ApplyEditAndWaitForReparseAsync(dotTyped);
-
-                // Act (apply the identifier start char change)
-                await manager.ApplyEditAndWaitForParseAsync(charTyped);
-
-                // Assert
-                Assert.Equal(2, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(manager.PartialParsingSyntaxTreeRoot,
-                    new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("foo")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(". "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("barb")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.EmptyHtml()));
-            }
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionAcceptsIdentifierTypedAfterDotIfLastChangeWasProvisionalAcceptanceOfDot()
-        {
-            // Arrange
-            var factory = new SpanFactory();
-            var dotTyped = new TestEdit(8, 0, new StringTextSnapshot("foo @foo bar"), 1, new StringTextSnapshot("foo @foo. bar"), ".");
-            var charTyped = new TestEdit(9, 0, new StringTextSnapshot("foo @foo. bar"), 1, new StringTextSnapshot("foo @foo.b bar"), "b");
-            using (var manager = CreateParserManager(dotTyped.OldSnapshot))
-            {
-                await manager.InitializeWithDocumentAsync(dotTyped.OldSnapshot);
-
-                // Apply the dot change
-                manager.ApplyEdit(dotTyped);
-
-                // Act (apply the identifier start char change)
-                manager.ApplyEdit(charTyped);
-
-                // Assert
-                Assert.Equal(1, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(manager.PartialParsingSyntaxTreeRoot,
-                    new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("foo.b")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(" bar")));
-            }
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpression_AcceptsParenthesisAtEnd_SingleEdit()
-        {
-            // Arrange
-            var factory = new SpanFactory();
-            var edit = new TestEdit(8, 0, new StringTextSnapshot("foo @foo bar"), 2, new StringTextSnapshot("foo @foo() bar"), "()");
-
-            using (var manager = CreateParserManager(edit.OldSnapshot))
-            {
-                await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
-
-                // Apply the () edit
-                manager.ApplyEdit(edit);
-
-                // Assert
-                Assert.Equal(1, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(
-                    manager.PartialParsingSyntaxTreeRoot,
-                    new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("foo()")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(" bar")));
-            }
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpression_AcceptsParenthesisAtEnd_TwoEdits()
-        {
-            // Arrange
-            var factory = new SpanFactory();
-            var edit1 = new TestEdit(8, 0, new StringTextSnapshot("foo @foo bar"), 1, new StringTextSnapshot("foo @foo( bar"), "(");
-            var edit2 = new TestEdit(9, 0, new StringTextSnapshot("foo @foo( bar"), 1, new StringTextSnapshot("foo @foo() bar"), ")");
-            using (var manager = CreateParserManager(edit1.OldSnapshot))
-            {
-                await manager.InitializeWithDocumentAsync(edit1.OldSnapshot);
-
-                // Apply the ( edit
-                manager.ApplyEdit(edit1);
-
-                // Apply the ) edit
-                manager.ApplyEdit(edit2);
-
-                // Assert
-                Assert.Equal(1, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(
-                    manager.PartialParsingSyntaxTreeRoot,
-                    new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("foo()")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(" bar")));
-            }
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfIfKeywordTyped()
-        {
-            await RunTypeKeywordTestAsync("if");
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfDoKeywordTyped()
-        {
-            await RunTypeKeywordTestAsync("do");
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfTryKeywordTyped()
-        {
-            await RunTypeKeywordTestAsync("try");
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfForKeywordTyped()
-        {
-            await RunTypeKeywordTestAsync("for");
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfForEachKeywordTyped()
-        {
-            await RunTypeKeywordTestAsync("foreach");
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfWhileKeywordTyped()
-        {
-            await RunTypeKeywordTestAsync("while");
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfSwitchKeywordTyped()
-        {
-            await RunTypeKeywordTestAsync("switch");
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfLockKeywordTyped()
-        {
-            await RunTypeKeywordTestAsync("lock");
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfUsingKeywordTyped()
-        {
-            await RunTypeKeywordTestAsync("using");
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfSectionKeywordTyped()
-        {
-            await RunTypeKeywordTestAsync("section");
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfInheritsKeywordTyped()
-        {
-            await RunTypeKeywordTestAsync("inherits");
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfFunctionsKeywordTyped()
-        {
-            await RunTypeKeywordTestAsync("functions");
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfNamespaceKeywordTyped()
-        {
-            await RunTypeKeywordTestAsync("namespace");
-        }
-
-        [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfClassKeywordTyped()
-        {
-            await RunTypeKeywordTestAsync("class");
-        }
-
-        private TestParserManager CreateParserManager(ITextSnapshot originalSnapshot)
-        {
-            var textBuffer = new TestTextBuffer(originalSnapshot);
-            var documentTracker = CreateDocumentTracker(textBuffer);
-            var templateEngineFactory = CreateProjectEngineFactory();
-            var parser = new DefaultVisualStudioRazorParser(
-                Dispatcher,
-                documentTracker,
-                templateEngineFactory,
-                new DefaultErrorReporter(),
-                new TestCompletionBroker())
-            {
-                // We block idle work with the below reset events. Therefore, make tests fast and have the idle timer fire as soon as possible.
-                IdleDelay = TimeSpan.FromMilliseconds(1),
-                NotifyForegroundIdleStart = new ManualResetEventSlim(),
-                BlockBackgroundIdleWork = new ManualResetEventSlim(),
-            };
-
-            parser.StartParser();
-
-            return new TestParserManager(parser);
-        }
-
-        private static ProjectSnapshotProjectEngineFactory CreateProjectEngineFactory(
-            string path = TestLinePragmaFileName,
-            IEnumerable<TagHelperDescriptor> tagHelpers = null)
-        {
-            var fileSystem = new TestRazorProjectFileSystem();
-            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem, builder =>
-            {
-                RazorExtensions.Register(builder);
-
-                builder.AddDefaultImports("@addTagHelper *, Test");
-
-                if (tagHelpers != null)
-                {
-                    builder.AddTagHelpers(tagHelpers);
-                }
-            });
-
-            return new TestProjectSnapshotProjectEngineFactory()
-            {
-                Engine = projectEngine,
-            };
-        }
-
-        private async Task RunTypeKeywordTestAsync(string keyword)
-        {
-            // Arrange
-            var before = "@" + keyword.Substring(0, keyword.Length - 1);
-            var after = "@" + keyword;
-            var changed = new StringTextSnapshot(after);
-            var old = new StringTextSnapshot(before);
-            var change = new SourceChange(keyword.Length, 0, keyword[keyword.Length - 1].ToString());
-            var edit = new TestEdit(change, old, changed);
-            using (var manager = CreateParserManager(old))
-            {
-                await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
-
-                // Act
-                await manager.ApplyEditAndWaitForParseAsync(edit);
-
-                // Assert
-                Assert.Equal(2, manager.ParseCount);
-            }
-        }
-
-        private static void DoWithTimeoutIfNotDebugging(Func<int, bool> withTimeout)
-        {
-#if DEBUG
-            if (Debugger.IsAttached)
-            {
-                withTimeout(Timeout.Infinite);
-            }
-            else
-            {
-#endif
-                Assert.True(withTimeout((int)TimeSpan.FromSeconds(5).TotalMilliseconds), "Timeout expired!");
-#if DEBUG
-            }
-#endif
-        }
-
-        private VisualStudioDocumentTracker CreateDocumentTracker(Text.ITextBuffer textBuffer)
-        {
-            var focusedTextView = Mock.Of<ITextView>(textView => textView.HasAggregateFocus == true);
-            var documentTracker = Mock.Of<VisualStudioDocumentTracker>(tracker =>
-                tracker.TextBuffer == textBuffer &&
-                tracker.TextViews == new[] { focusedTextView } &&
-                tracker.FilePath == TestLinePragmaFileName &&
-                tracker.ProjectPath == TestProjectPath &&
-                tracker.ProjectSnapshot == ProjectSnapshot &&
-                tracker.IsSupportedProject == true);
-            textBuffer.Properties.AddProperty(typeof(VisualStudioDocumentTracker), documentTracker);
-
-            return documentTracker;
-        }
-
-        private class TestParserManager : IDisposable
-        {
-            public int ParseCount;
-
-            private readonly ManualResetEventSlim _parserComplete;
-            private readonly ManualResetEventSlim _reparseComplete;
-            private readonly TestTextBuffer _testBuffer;
-            private readonly DefaultVisualStudioRazorParser _parser;
-
-            public TestParserManager(DefaultVisualStudioRazorParser parser)
-            {
-                _parserComplete = new ManualResetEventSlim();
-                _reparseComplete = new ManualResetEventSlim();
-
-                _testBuffer = (TestTextBuffer)parser.TextBuffer;
-                ParseCount = 0;
-
-                _parser = parser;
-                parser.DocumentStructureChanged += (sender, args) =>
-                {
-                    CurrentSyntaxTree = args.CodeDocument.GetSyntaxTree();
-
-                    Interlocked.Increment(ref ParseCount);
-
-                    if (args.SourceChange == null)
-                    {
-                        // Reparse occurred
-                        _reparseComplete.Set();
-                    }
-
-                    _parserComplete.Set();
-                };
-            }
-
-            public RazorSyntaxTree CurrentSyntaxTree { get; private set; }
-
-            public Block PartialParsingSyntaxTreeRoot => _parser._partialParser.SyntaxTreeRoot;
-
-            public async Task InitializeWithDocumentAsync(ITextSnapshot snapshot)
-            {
-                var old = new StringTextSnapshot(string.Empty);
-                var initialChange = new SourceChange(0, 0, snapshot.GetText());
-                var edit = new TestEdit(initialChange, old, snapshot);
-                await ApplyEditAndWaitForParseAsync(edit);
-            }
-
-            public void ApplyEdit(TestEdit edit)
-            {
-                _testBuffer.ApplyEdit(edit);
-            }
-
-            public async Task ApplyEditAndWaitForParseAsync(TestEdit edit)
-            {
-                ApplyEdit(edit);
-                await WaitForParseAsync();
-            }
-
-            public async Task ApplyEditAndWaitForReparseAsync(TestEdit edit)
-            {
-                ApplyEdit(edit);
-                await WaitForReparseAsync();
-            }
-
-            public async Task WaitForParseAsync()
-            {
-                // Get off of the foreground thread so we can wait for the document structure changed event to fire
-                await Task.Run(() =>
-                {
-                    DoWithTimeoutIfNotDebugging(_parserComplete.Wait);
-                });
-
-                _parserComplete.Reset();
-            }
-
-            public async Task WaitForReparseAsync()
-            {
-                Assert.True(_parser._idleTimer != null);
-
-                // Allow background idle work to continue
-                _parser.BlockBackgroundIdleWork.Set();
-
-                // Get off of the foreground thread so we can wait for the idle timer to fire
-                await Task.Run(() =>
-                {
-                    DoWithTimeoutIfNotDebugging(_parser.NotifyForegroundIdleStart.Wait);
-                });
-
-                Assert.Null(_parser._idleTimer);
-
-                // Get off of the foreground thread so we can wait for the document structure changed event to fire for reparse
-                await Task.Run(() =>
-                {
-                    DoWithTimeoutIfNotDebugging(_reparseComplete.Wait);
-                });
-
-                _reparseComplete.Reset();
-                _parser.BlockBackgroundIdleWork.Reset();
-                _parser.NotifyForegroundIdleStart.Reset();
-            }
-
-            public void Dispose()
-            {
-                _parser.Dispose();
-            }
-        }
-
-        private class TestCompletionBroker : VisualStudioCompletionBroker
-        {
-            public override bool IsCompletionActive(ITextView textView) => false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioRazorParserTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioRazorParserTest.cs
deleted file mode 100644
index 3df48c553fc4..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioRazorParserTest.cs
+++ /dev/null
@@ -1,336 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Threading;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Test;
-using Microsoft.VisualStudio.Text;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultVisualStudioRazorParserTest : ForegroundDispatcherTestBase
-    {
-        public DefaultVisualStudioRazorParserTest()
-        {
-            Workspace = TestWorkspace.Create();
-            ProjectSnapshot = new EphemeralProjectSnapshot(Workspace.Services, "c:\\SomeProject.csproj");
-
-            var engine = RazorProjectEngine.Create(RazorConfiguration.Default, RazorProjectFileSystem.Empty);
-            ProjectEngineFactory = Mock.Of<ProjectSnapshotProjectEngineFactory>(
-                f => f.Create(
-                    It.IsAny<ProjectSnapshot>(),
-                    It.IsAny<RazorProjectFileSystem>(),
-                    It.IsAny<Action<RazorProjectEngineBuilder>>()) == engine);
-        }
-
-        private ProjectSnapshot ProjectSnapshot { get; }
-
-        private ProjectSnapshotProjectEngineFactory ProjectEngineFactory { get; }
-
-        private Workspace Workspace { get; }
-
-        private VisualStudioDocumentTracker CreateDocumentTracker(bool isSupportedProject = true)
-        {
-            var documentTracker = Mock.Of<VisualStudioDocumentTracker>(tracker =>
-            tracker.TextBuffer == new TestTextBuffer(new StringTextSnapshot(string.Empty)) &&
-                tracker.ProjectPath == "c:\\SomeProject.csproj" &&
-                tracker.ProjectSnapshot == ProjectSnapshot &&
-                tracker.FilePath == "c:\\SomeFilePath.cshtml" &&
-                tracker.IsSupportedProject == isSupportedProject);
-
-            return documentTracker;
-        }
-
-        [ForegroundFact]
-        public void ReparseOnForeground_NoopsIfDisposed()
-        {
-            // Arrange
-            var parser = new DefaultVisualStudioRazorParser(
-                Dispatcher,
-                CreateDocumentTracker(),
-                ProjectEngineFactory,
-                new DefaultErrorReporter(),
-                Mock.Of<VisualStudioCompletionBroker>());
-            parser.Dispose();
-
-            // Act & Assert
-            parser.ReparseOnForeground(null);
-        }
-
-        [ForegroundFact]
-        public void OnIdle_NoopsIfDisposed()
-        {
-            // Arrange
-            var parser = new DefaultVisualStudioRazorParser(
-                Dispatcher,
-                CreateDocumentTracker(),
-                ProjectEngineFactory,
-                new DefaultErrorReporter(),
-                Mock.Of<VisualStudioCompletionBroker>());
-            parser.Dispose();
-
-            // Act & Assert
-            parser.OnIdle(null);
-        }
-
-        [ForegroundFact]
-        public void OnDocumentStructureChanged_NoopsIfDisposed()
-        {
-            // Arrange
-            var parser = new DefaultVisualStudioRazorParser(
-                Dispatcher,
-                CreateDocumentTracker(),
-                ProjectEngineFactory,
-                new DefaultErrorReporter(),
-                Mock.Of<VisualStudioCompletionBroker>());
-            parser.Dispose();
-
-            // Act & Assert
-            parser.OnDocumentStructureChanged(new object());
-        }
-
-        [ForegroundFact]
-        public void OnDocumentStructureChanged_IgnoresEditsThatAreOld()
-        {
-            // Arrange
-            using (var parser = new DefaultVisualStudioRazorParser(
-                Dispatcher,
-                CreateDocumentTracker(),
-                ProjectEngineFactory,
-                new DefaultErrorReporter(),
-                Mock.Of<VisualStudioCompletionBroker>()))
-            {
-                var called = false;
-                parser.DocumentStructureChanged += (sender, e) => called = true;
-                parser._latestChangeReference = new BackgroundParser.ChangeReference(null, new StringTextSnapshot(string.Empty));
-                var args = new BackgroundParserResultsReadyEventArgs(
-                    new BackgroundParser.ChangeReference(new SourceChange(0, 0, string.Empty), new StringTextSnapshot(string.Empty)),
-                    TestRazorCodeDocument.CreateEmpty());
-
-                // Act
-                parser.OnDocumentStructureChanged(args);
-
-                // Assert
-                Assert.False(called);
-            }
-        }
-
-        [ForegroundFact]
-        public void OnDocumentStructureChanged_FiresForLatestTextBufferEdit()
-        {
-            // Arrange
-            var documentTracker = CreateDocumentTracker();
-            using (var parser = new DefaultVisualStudioRazorParser(
-                Dispatcher,
-                documentTracker,
-                ProjectEngineFactory,
-                new DefaultErrorReporter(),
-                Mock.Of<VisualStudioCompletionBroker>()))
-            {
-                var called = false;
-                parser.DocumentStructureChanged += (sender, e) => called = true;
-                var latestChange = new SourceChange(0, 0, string.Empty);
-                var latestSnapshot = documentTracker.TextBuffer.CurrentSnapshot;
-                parser._latestChangeReference = new BackgroundParser.ChangeReference(latestChange, latestSnapshot);
-                var codeDocument = TestRazorCodeDocument.CreateEmpty();
-                codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(TestRazorSourceDocument.Create()));
-                var args = new BackgroundParserResultsReadyEventArgs(
-                    parser._latestChangeReference,
-                    codeDocument);
-
-                // Act
-                parser.OnDocumentStructureChanged(args);
-
-                // Assert
-                Assert.True(called);
-            }
-        }
-
-        [ForegroundFact]
-        public void OnDocumentStructureChanged_FiresForOnlyLatestTextBufferReparseEdit()
-        {
-            // Arrange
-            var documentTracker = CreateDocumentTracker();
-            using (var parser = new DefaultVisualStudioRazorParser(
-                Dispatcher,
-                documentTracker,
-                ProjectEngineFactory,
-                new DefaultErrorReporter(),
-                Mock.Of<VisualStudioCompletionBroker>()))
-            {
-                var called = false;
-                parser.DocumentStructureChanged += (sender, e) => called = true;
-                var latestSnapshot = documentTracker.TextBuffer.CurrentSnapshot;
-                parser._latestChangeReference = new BackgroundParser.ChangeReference(null, latestSnapshot);
-                var codeDocument = TestRazorCodeDocument.CreateEmpty();
-                codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(TestRazorSourceDocument.Create()));
-                var badArgs = new BackgroundParserResultsReadyEventArgs(
-                    // This is a different reparse edit, shouldn't be fired for this call
-                    new BackgroundParser.ChangeReference(null, latestSnapshot),
-                    codeDocument);
-                var goodArgs = new BackgroundParserResultsReadyEventArgs(
-                    parser._latestChangeReference,
-                    codeDocument);
-
-                // Act - 1
-                parser.OnDocumentStructureChanged(badArgs);
-
-                // Assert - 1
-                Assert.False(called);
-
-                // Act - 2
-                parser.OnDocumentStructureChanged(goodArgs);
-
-                // Assert - 2
-                Assert.True(called);
-            }
-        }
-
-        [ForegroundFact]
-        public void StartIdleTimer_DoesNotRestartTimerWhenAlreadyRunning()
-        {
-            // Arrange
-            using (var parser = new DefaultVisualStudioRazorParser(
-                Dispatcher,
-                CreateDocumentTracker(),
-                ProjectEngineFactory,
-                new DefaultErrorReporter(),
-                Mock.Of<VisualStudioCompletionBroker>())
-            {
-                BlockBackgroundIdleWork = new ManualResetEventSlim(),
-                IdleDelay = TimeSpan.FromSeconds(5)
-            })
-            {
-                parser.StartIdleTimer();
-                using (var currentTimer = parser._idleTimer)
-                {
-
-                    // Act
-                    parser.StartIdleTimer();
-                    var afterTimer = parser._idleTimer;
-
-                    // Assert
-                    Assert.NotNull(currentTimer);
-                    Assert.Same(currentTimer, afterTimer);
-                }
-            }
-        }
-
-        [ForegroundFact]
-        public void StopIdleTimer_StopsTimer()
-        {
-            // Arrange
-            using (var parser = new DefaultVisualStudioRazorParser(
-                Dispatcher,
-                CreateDocumentTracker(),
-                ProjectEngineFactory,
-                new DefaultErrorReporter(),
-                Mock.Of<VisualStudioCompletionBroker>())
-            {
-                BlockBackgroundIdleWork = new ManualResetEventSlim(),
-                IdleDelay = TimeSpan.FromSeconds(5)
-            })
-            {
-                parser.StartIdleTimer();
-                var currentTimer = parser._idleTimer;
-
-                // Act
-                parser.StopIdleTimer();
-
-                // Assert
-                Assert.NotNull(currentTimer);
-                Assert.Null(parser._idleTimer);
-            }
-        }
-
-        [ForegroundFact]
-        public void StopParser_DetachesFromTextBufferChangeLoop()
-        {
-            // Arrange
-            var documentTracker = CreateDocumentTracker();
-            var textBuffer = (TestTextBuffer)documentTracker.TextBuffer;
-            using (var parser = new DefaultVisualStudioRazorParser(
-                Dispatcher,
-                CreateDocumentTracker(),
-                ProjectEngineFactory,
-                new DefaultErrorReporter(),
-                Mock.Of<VisualStudioCompletionBroker>()))
-            {
-                parser.StartParser();
-
-                // Act
-                parser.StopParser();
-
-                // Assert
-                Assert.Empty(textBuffer.AttachedChangedEvents);
-                Assert.Null(parser._parser);
-            }
-        }
-
-        [ForegroundFact]
-        public void StartParser_AttachesToTextBufferChangeLoop()
-        {
-            // Arrange
-            var documentTracker = CreateDocumentTracker();
-            var textBuffer = (TestTextBuffer)documentTracker.TextBuffer;
-            using (var parser = new DefaultVisualStudioRazorParser(
-                Dispatcher,
-                documentTracker,
-                ProjectEngineFactory,
-                new DefaultErrorReporter(),
-                Mock.Of<VisualStudioCompletionBroker>()))
-            {
-                // Act
-                parser.StartParser();
-
-                // Assert
-                Assert.Equal(1, textBuffer.AttachedChangedEvents.Count);
-                Assert.NotNull(parser._parser);
-            }
-        }
-
-        [ForegroundFact]
-        public void TryReinitializeParser_ReturnsTrue_IfProjectIsSupported()
-        {
-            // Arrange
-            using (var parser = new DefaultVisualStudioRazorParser(
-                Dispatcher,
-                CreateDocumentTracker(isSupportedProject: true),
-                ProjectEngineFactory,
-                new DefaultErrorReporter(),
-                Mock.Of<VisualStudioCompletionBroker>()))
-            {
-                // Act
-                var result = parser.TryReinitializeParser();
-
-                // Assert
-                Assert.True(result);
-            }
-        }
-
-        [ForegroundFact]
-        public void TryReinitializeParser_ReturnsFalse_IfProjectIsNotSupported()
-        {
-            // Arrange
-            using (var parser = new DefaultVisualStudioRazorParser(
-                Dispatcher,
-                CreateDocumentTracker(isSupportedProject: false),
-                ProjectEngineFactory,
-                new DefaultErrorReporter(),
-                Mock.Of<VisualStudioCompletionBroker>()))
-            {
-                // Act
-                var result = parser.TryReinitializeParser();
-
-                // Assert
-                Assert.False(result);
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultWorkspaceEditorSettingsTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultWorkspaceEditorSettingsTest.cs
deleted file mode 100644
index 64365755bb80..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultWorkspaceEditorSettingsTest.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.Editor;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class DefaultWorkspaceEditorSettingsTest : ForegroundDispatcherTestBase
-    {
-        [Fact]
-        public void InitialSettingsAreEditorSettingsManagerDefault()
-        {
-            // Arrange
-            var editorSettings = new EditorSettings(true, 123);
-            var editorSettingsManager = Mock.Of<EditorSettingsManager>(m => m.Current == editorSettings);
-
-            // Act
-            var manager = new DefaultWorkspaceEditorSettings(Dispatcher, editorSettingsManager);
-
-            // Assert
-            Assert.Equal(editorSettings, manager.Current);
-        }
-
-        [Fact]
-        public void OnChanged_TriggersChanged()
-        {
-            // Arrange
-            var manager = new DefaultWorkspaceEditorSettings(Dispatcher, Mock.Of<EditorSettingsManager>());
-            var called = false;
-            manager.Changed += (caller, args) =>
-            {
-                called = true;
-            };
-
-            // Act
-            manager.OnChanged(null, null);
-
-            // Assert
-            Assert.True(called);
-        }
-
-        [Fact]
-        public void Attach_CalledOnceForMultipleListeners()
-        {
-            // Arrange
-            var manager = new TestEditorSettingsManagerInternal(Dispatcher);
-
-            // Act
-            manager.Changed += (caller, args) => { };
-            manager.Changed += (caller, args) => { };
-
-            // Assert
-            Assert.Equal(1, manager.AttachCount);
-        }
-
-        [Fact]
-        public void Detach_CalledOnceWhenNoMoreListeners()
-        {
-            // Arrange
-            var manager = new TestEditorSettingsManagerInternal(Dispatcher);
-            EventHandler<EditorSettingsChangedEventArgs> listener1 = (caller, args) => { };
-            EventHandler<EditorSettingsChangedEventArgs> listener2 = (caller, args) => { };
-            manager.Changed += listener1;
-            manager.Changed += listener2;
-
-            // Act
-            manager.Changed -= listener1;
-            manager.Changed -= listener2;
-
-            // Assert
-            Assert.Equal(1, manager.DetachCount);
-        }
-
-        private class TestEditorSettingsManagerInternal : DefaultWorkspaceEditorSettings
-        {
-            public TestEditorSettingsManagerInternal(ForegroundDispatcher foregroundDispatcher) : base(foregroundDispatcher, Mock.Of<EditorSettingsManager>())
-            {
-            }
-
-            public int AttachCount { get; private set; }
-
-            public int DetachCount { get; private set; }
-
-            internal override void AttachToEditorSettingsManager()
-            {
-                AttachCount++;
-            }
-
-            internal override void DetachFromEditorSettingsManager()
-            {
-                DetachCount++;
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentManagerBaseTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentManagerBaseTest.cs
deleted file mode 100644
index e11fd055a31c..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentManagerBaseTest.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Test;
-using Microsoft.VisualStudio.Text;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    public class EditorDocumentManagerBaseTest : ForegroundDispatcherTestBase
-    {
-        public EditorDocumentManagerBaseTest()
-        {
-
-            Manager = new TestEditorDocumentManager(Dispatcher);
-        }
-
-        private TestEditorDocumentManager Manager { get; }
-
-        public string Project1 => "c:\\Project1";
-
-        public string Project2 => "c:\\Project2";
-
-        public string File1 => "c:\\Project1\\File1.cshtml";
-
-        public string File2 => "c:\\Project2\\File2.cshtml";
-
-        public TestTextBuffer TextBuffer => new TestTextBuffer(new StringTextSnapshot("HI"));
-
-        [ForegroundFact]
-        public void GetOrCreateDocument_CreatesAndCachesDocument()
-        {
-            // Arrange
-            var expected = Manager.GetOrCreateDocument(new DocumentKey(Project1, File1), null, null, null, null);
-
-            // Act
-            Manager.TryGetDocument(new DocumentKey(Project1, File1), out var actual);
-
-            // Assert
-            Assert.Same(expected, actual);
-        }
-
-        [ForegroundFact]
-        public void GetOrCreateDocument_NoOp()
-        {
-            // Arrange
-            var expected = Manager.GetOrCreateDocument(new DocumentKey(Project1, File1), null, null, null, null);
-
-            // Act
-            var actual = Manager.GetOrCreateDocument(new DocumentKey(Project1, File1), null, null, null, null);
-
-            // Assert
-            Assert.Same(expected, actual);
-        }
-
-        [ForegroundFact]
-        public void GetOrCreateDocument_SameFile_MulipleProjects()
-        {
-            // Arrange
-            var document1 = Manager.GetOrCreateDocument(new DocumentKey(Project1, File1), null, null, null, null);
-
-            // Act
-            var document2 = Manager.GetOrCreateDocument(new DocumentKey(Project2, File1), null, null, null, null);
-
-            // Assert
-            Assert.NotSame(document1, document2);
-        }
-
-        [ForegroundFact]
-        public void GetOrCreateDocument_MulipleFiles_SameProject()
-        {
-            // Arrange
-            var document1 = Manager.GetOrCreateDocument(new DocumentKey(Project1, File1), null, null, null, null);
-
-            // Act
-            var document2 = Manager.GetOrCreateDocument(new DocumentKey(Project1, File2), null, null, null, null);
-
-            // Assert
-            Assert.NotSame(document1, document2);
-        }
-
-        [ForegroundFact]
-        public void GetOrCreateDocument_WithBuffer_AttachesBuffer()
-        {
-            // Arrange
-            Manager.Buffers.Add(File1, TextBuffer);
-
-            // Act
-            var document = Manager.GetOrCreateDocument(new DocumentKey(Project1, File1), null, null, null, null);
-
-            // Assert
-            Assert.True(document.IsOpenInEditor);
-            Assert.NotNull(document.EditorTextBuffer);
-
-            Assert.Same(document, Assert.Single(Manager.Opened));
-            Assert.Empty(Manager.Closed);
-        }
-
-        [ForegroundFact]
-        public void TryGetMatchingDocuments_MultipleDocuments()
-        {
-            // Arrange
-            var document1 = Manager.GetOrCreateDocument(new DocumentKey(Project1, File1), null, null, null, null);
-            var document2 = Manager.GetOrCreateDocument(new DocumentKey(Project2, File1), null, null, null, null);
-
-            // Act
-            Manager.TryGetMatchingDocuments(File1, out var documents);
-
-            // Assert
-            Assert.Collection(
-                documents.OrderBy(d => d.ProjectFilePath),
-                d => Assert.Same(document1, d),
-                d => Assert.Same(document2, d));
-        }
-
-        [ForegroundFact]
-        public void RemoveDocument_MultipleDocuments_RemovesOne()
-        {
-            // Arrange
-            var document1 = Manager.GetOrCreateDocument(new DocumentKey(Project1, File1), null, null, null, null);
-            var document2 = Manager.GetOrCreateDocument(new DocumentKey(Project2, File1), null, null, null, null);
-
-            // Act
-            Manager.RemoveDocument(document1);
-
-            // Assert
-            Manager.TryGetMatchingDocuments(File1, out var documents);
-            Assert.Collection(
-                documents.OrderBy(d => d.ProjectFilePath),
-                d => Assert.Same(document2, d));
-        }
-
-        [ForegroundFact]
-        public void DocumentOpened_MultipleDocuments_OpensAll()
-        {
-            // Arrange
-            var document1 = Manager.GetOrCreateDocument(new DocumentKey(Project1, File1), null, null, null, null);
-            var document2 = Manager.GetOrCreateDocument(new DocumentKey(Project2, File1), null, null, null, null);
-
-            // Act
-            Manager.DocumentOpened(File1, TextBuffer);
-
-            // Assert
-            Assert.Collection(
-                Manager.Opened.OrderBy(d => d.ProjectFilePath),
-                d => Assert.Same(document1, d),
-                d => Assert.Same(document2, d));
-        }
-
-        [ForegroundFact]
-        public void DocumentOpened_MultipleDocuments_ClosesAll()
-        {
-            // Arrange
-            var document1 = Manager.GetOrCreateDocument(new DocumentKey(Project1, File1), null, null, null, null);
-            var document2 = Manager.GetOrCreateDocument(new DocumentKey(Project2, File1), null, null, null, null);
-            Manager.DocumentOpened(File1, TextBuffer);
-
-            // Act
-            Manager.DocumentClosed(File1);
-
-            // Assert
-            Assert.Collection(
-                Manager.Closed.OrderBy(d => d.ProjectFilePath),
-                d => Assert.Same(document1, d),
-                d => Assert.Same(document2, d));
-        }
-
-        private class TestEditorDocumentManager : EditorDocumentManagerBase
-        {
-            public TestEditorDocumentManager(ForegroundDispatcher foregroundDispatcher) 
-                : base(foregroundDispatcher, new DefaultFileChangeTrackerFactory())
-            {
-            }
-
-            public List<EditorDocument> Opened { get; } = new List<EditorDocument>();
-
-            public List<EditorDocument> Closed { get; } = new List<EditorDocument>();
-
-            public Dictionary<string, ITextBuffer> Buffers { get; } = new Dictionary<string, ITextBuffer>();
-
-            public new void DocumentOpened(string filePath, ITextBuffer textBuffer)
-            {
-                base.DocumentOpened(filePath, textBuffer);
-            }
-
-            public new void DocumentClosed(string filePath)
-            {
-                base.DocumentClosed(filePath);
-            }
-
-            protected override ITextBuffer GetTextBufferForOpenDocument(string filePath)
-            {
-                Buffers.TryGetValue(filePath, out var buffer);
-                return buffer;
-            }
-
-            protected override void OnDocumentOpened(EditorDocument document)
-            {
-                Opened.Add(document);
-            }
-
-            protected override void OnDocumentClosed(EditorDocument document)
-            {
-                Closed.Add(document);
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentManagerListenerTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentManagerListenerTest.cs
deleted file mode 100644
index 6d1eddacee5b..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentManagerListenerTest.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Test;
-using Microsoft.VisualStudio.Text;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    public class EditorDocumentManagerListenerTest
-    {
-        public EditorDocumentManagerListenerTest()
-        {
-            ProjectFilePath = "C:\\project1\\project.csproj";
-            DocumentFilePath = "c:\\project1\\file1.cshtml";
-            TextLoader = TextLoader.From(TextAndVersion.Create(SourceText.From("FILE"), VersionStamp.Default));
-            FileChangeTracker = new DefaultFileChangeTracker(DocumentFilePath);
-
-            TextBuffer = new TestTextBuffer(new StringTextSnapshot("Hello"));
-        }
-
-        private string ProjectFilePath { get; }
-
-        private string DocumentFilePath { get; }
-
-        private TextLoader TextLoader { get; }
-
-        private FileChangeTracker FileChangeTracker { get; }
-
-        private TestTextBuffer TextBuffer { get; }
-
-        [Fact]
-        public void ProjectManager_Changed_DocumentAdded_InvokesGetOrCreateDocument()
-        {
-            // Arrange
-            var changedOnDisk = new EventHandler((o, args) => { });
-            var changedInEditor = new EventHandler((o, args) => { });
-            var opened = new EventHandler((o, args) => { });
-            var closed = new EventHandler((o, args) => { });
-
-            var editorDocumentManger = new Mock<EditorDocumentManager>(MockBehavior.Strict);
-            editorDocumentManger
-                .Setup(e => e.GetOrCreateDocument(It.IsAny<DocumentKey>(), It.IsAny<EventHandler>(), It.IsAny<EventHandler>(), It.IsAny<EventHandler>(), It.IsAny<EventHandler>()))
-                .Returns(GetEditorDocument())
-                .Callback<DocumentKey, EventHandler, EventHandler, EventHandler, EventHandler>((key, onChangedOnDisk, onChangedInEditor, onOpened, onClosed) =>
-                {
-                    Assert.Same(changedOnDisk, onChangedOnDisk);
-                    Assert.Same(changedInEditor, onChangedInEditor);
-                    Assert.Same(opened, onOpened);
-                    Assert.Same(closed, onClosed);
-                });
-
-            var listener = new EditorDocumentManagerListener(editorDocumentManger.Object, changedOnDisk, changedInEditor, opened, closed);
-
-            // Act & Assert
-            listener.ProjectManager_Changed(null, new ProjectChangeEventArgs("/Path/to/project.csproj", ProjectChangeKind.DocumentAdded));
-        }
-
-        [Fact]
-        public void ProjectManager_Changed_OpenDocumentAdded_InvokesOnOpened()
-        {
-            // Arrange
-            var called = false;
-            var opened = new EventHandler((o, args) => { called = true; });
-
-            var editorDocumentManger = new Mock<EditorDocumentManager>(MockBehavior.Strict);
-            editorDocumentManger
-                .Setup(e => e.GetOrCreateDocument(It.IsAny<DocumentKey>(), It.IsAny<EventHandler>(), It.IsAny<EventHandler>(), It.IsAny<EventHandler>(), It.IsAny<EventHandler>()))
-                .Returns(GetEditorDocument(isOpen: true));
-
-            var listener = new EditorDocumentManagerListener(editorDocumentManger.Object, onChangedOnDisk: null, onChangedInEditor: null, onOpened: opened, onClosed: null);
-
-            // Act
-            listener.ProjectManager_Changed(null, new ProjectChangeEventArgs("/Path/to/project.csproj", ProjectChangeKind.DocumentAdded));
-
-            // Assert
-            Assert.True(called);
-        }
-
-        private EditorDocument GetEditorDocument(bool isOpen = false)
-        {
-            var document = new EditorDocument(
-                Mock.Of<EditorDocumentManager>(),
-                ProjectFilePath,
-                DocumentFilePath,
-                TextLoader,
-                FileChangeTracker,
-                isOpen ? TextBuffer : null,
-                changedOnDisk: null,
-                changedInEditor: null,
-                opened: null,
-                closed: null);
-
-            return document;
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentTest.cs
deleted file mode 100644
index 7173be6d15c5..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentTest.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Test;
-using Microsoft.VisualStudio.Text;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    public class EditorDocumentTest
-    {
-        public EditorDocumentTest()
-        {
-            DocumentManager = Mock.Of<EditorDocumentManager>();
-            ProjectFilePath = "C:\\project1\\project.csproj";
-            DocumentFilePath = "c:\\project1\\file1.cshtml";
-            TextLoader = TextLoader.From(TextAndVersion.Create(SourceText.From("FILE"), VersionStamp.Default));
-            FileChangeTracker = new DefaultFileChangeTracker(DocumentFilePath);
-
-            TextBuffer = new TestTextBuffer(new StringTextSnapshot("Hello"));
-        }
-
-        private EditorDocumentManager DocumentManager { get; }
-
-        private string ProjectFilePath { get; }
-
-        private string DocumentFilePath { get; }
-
-        private TextLoader TextLoader { get; }
-
-        private FileChangeTracker FileChangeTracker { get; }
-
-        private TestTextBuffer TextBuffer { get; }
-
-        [Fact]
-        public void EditorDocument_CreatedWhileOpened()
-        {
-            // Arrange & Act
-            using (var document = new EditorDocument(
-                DocumentManager,
-                ProjectFilePath,
-                DocumentFilePath,
-                TextLoader,
-                FileChangeTracker,
-                TextBuffer,
-                changedOnDisk: null,
-                changedInEditor: null,
-                opened: null,
-                closed: null))
-            {
-                // Assert
-                Assert.True(document.IsOpenInEditor);
-                Assert.Same(TextBuffer, document.EditorTextBuffer);
-                Assert.NotNull(document.EditorTextContainer);
-            }
-        }
-
-        [Fact]
-        public void EditorDocument_CreatedWhileClosed()
-        {
-            // Arrange & Act
-            using (var document = new EditorDocument(
-                DocumentManager,
-                ProjectFilePath,
-                DocumentFilePath,
-                TextLoader,
-                FileChangeTracker,
-                null,
-                changedOnDisk: null,
-                changedInEditor: null,
-                opened: null,
-                closed: null))
-            {
-                // Assert
-                Assert.False(document.IsOpenInEditor);
-                Assert.Null(document.EditorTextBuffer);
-                Assert.Null(document.EditorTextContainer);
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Infrastructure/TestEdit.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Infrastructure/TestEdit.cs
deleted file mode 100644
index 33dd99b7ebc4..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Infrastructure/TestEdit.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Test
-{
-    public class TestEdit
-    {
-        public TestEdit(SourceChange  change, ITextSnapshot oldSnapshot, ITextSnapshot newSnapshot)
-        {
-            Change = change;
-            OldSnapshot = oldSnapshot;
-            NewSnapshot = newSnapshot;
-        }
-
-        public TestEdit(int position, int oldLength, ITextSnapshot oldSnapshot, int newLength, ITextSnapshot newSnapshot, string newText)
-        {
-            Change = new SourceChange(position, oldLength, newText);
-            OldSnapshot = oldSnapshot;
-            NewSnapshot = newSnapshot;
-        }
-
-        public SourceChange Change { get; }
-
-        public ITextSnapshot OldSnapshot { get; }
-
-        public ITextSnapshot NewSnapshot { get; }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Infrastructure/TestTextBuffer.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Infrastructure/TestTextBuffer.cs
deleted file mode 100644
index b835b4fe4785..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Infrastructure/TestTextBuffer.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Utilities;
-
-namespace Microsoft.VisualStudio.Test
-{
-    public class TestTextBuffer : ITextBuffer
-    {
-        private ITextSnapshot _currentSnapshot;
-        private List<EventHandler<TextContentChangedEventArgs>> _attachedChangedEvents;
-
-        public TestTextBuffer(ITextSnapshot initialSnapshot)
-        {
-            _currentSnapshot = initialSnapshot;
-            if (_currentSnapshot is StringTextSnapshot testSnapshot)
-            {
-                testSnapshot.TextBuffer = this;
-            }
-
-            _attachedChangedEvents = new List<EventHandler<TextContentChangedEventArgs>>();
-
-            ReadOnlyRegionsChanged += (sender, args) => { };
-            ChangedLowPriority += (sender, args) => { };
-            ChangedHighPriority += (sender, args) => { };
-            Changing += (sender, args) => { };
-            PostChanged += (sender, args) => { };
-            ContentTypeChanged += (sender, args) => { };
-            Properties = new PropertyCollection();
-        }
-
-        public void ApplyEdit(TestEdit edit)
-        {
-            ApplyEdits(edit);
-        }
-
-        public void ApplyEdits(params TestEdit[] edits)
-        {
-            var args = new TextContentChangedEventArgs(edits[0].OldSnapshot, edits[edits.Length - 1].NewSnapshot, new EditOptions(), null);
-            foreach (var edit in edits)
-            {
-                args.Changes.Add(new TestTextChange(edit.Change));
-            }
-
-            _currentSnapshot = edits[edits.Length - 1].NewSnapshot;
-            if (_currentSnapshot is StringTextSnapshot testSnapshot)
-            {
-                testSnapshot.TextBuffer = this;
-            }
-
-            foreach (var changedEvent in AttachedChangedEvents)
-            {
-                changedEvent.Invoke(this, args);
-            }
-
-            PostChanged?.Invoke(null, null);
-
-            ReadOnlyRegionsChanged?.Invoke(null, null);
-            ChangedLowPriority?.Invoke(null, null);
-            ChangedHighPriority?.Invoke(null, null);
-            Changing?.Invoke(null, null);
-            ContentTypeChanged?.Invoke(null, null);
-        }
-
-        public IReadOnlyList<EventHandler<TextContentChangedEventArgs>> AttachedChangedEvents => _attachedChangedEvents;
-
-        public ITextSnapshot CurrentSnapshot => _currentSnapshot;
-
-        public PropertyCollection Properties { get; }
-
-        public event EventHandler<SnapshotSpanEventArgs> ReadOnlyRegionsChanged;
-
-        public event EventHandler<TextContentChangedEventArgs> Changed
-        {
-            add
-            {
-                _attachedChangedEvents.Add(value);
-            }
-            remove
-            {
-                _attachedChangedEvents.Remove(value);
-            }
-        }
-            
-
-        public event EventHandler<TextContentChangedEventArgs> ChangedLowPriority;
-        public event EventHandler<TextContentChangedEventArgs> ChangedHighPriority;
-        public event EventHandler<TextContentChangingEventArgs> Changing;
-        public event EventHandler PostChanged;
-        public event EventHandler<ContentTypeChangedEventArgs> ContentTypeChanged;
-
-        public bool EditInProgress => throw new NotImplementedException();
-
-        public IContentType ContentType => throw new NotImplementedException();
-
-        public ITextEdit CreateEdit() => new BufferEdit(this);
-
-        public void ChangeContentType(IContentType newContentType, object editTag) => throw new NotImplementedException();
-
-        public bool CheckEditAccess() => throw new NotImplementedException();
-
-        public ITextEdit CreateEdit(EditOptions options, int? reiteratedVersionNumber, object editTag) => throw new NotImplementedException();
-
-        public IReadOnlyRegionEdit CreateReadOnlyRegionEdit() => throw new NotImplementedException();
-
-        public ITextSnapshot Delete(Span deleteSpan) => throw new NotImplementedException();
-
-        public NormalizedSpanCollection GetReadOnlyExtents(Span span) => throw new NotImplementedException();
-
-        public ITextSnapshot Insert(int position, string text) => throw new NotImplementedException();
-
-        public bool IsReadOnly(int position) => throw new NotImplementedException();
-
-        public bool IsReadOnly(int position, bool isEdit) => throw new NotImplementedException();
-
-        public bool IsReadOnly(Span span) => throw new NotImplementedException();
-
-        public bool IsReadOnly(Span span, bool isEdit) => throw new NotImplementedException();
-
-        public ITextSnapshot Replace(Text.Span replaceSpan, string replaceWith) => throw new NotImplementedException();
-
-        public void TakeThreadOwnership() => throw new NotImplementedException();
-
-        private class BufferEdit : ITextEdit
-        {
-            private readonly TestTextBuffer _textBuffer;
-            private readonly List<TestEdit> _edits;
-
-            public BufferEdit(TestTextBuffer textBuffer)
-            {
-                _textBuffer = textBuffer;
-                _edits = new List<TestEdit>();
-            }
-
-            public bool HasEffectiveChanges => throw new NotImplementedException();
-
-            public bool HasFailedChanges => throw new NotImplementedException();
-
-            public ITextSnapshot Snapshot => throw new NotImplementedException();
-
-            public bool Canceled => throw new NotImplementedException();
-
-            public ITextSnapshot Apply()
-            {
-                _textBuffer.ApplyEdits(_edits.ToArray());
-                _edits.Clear();
-
-                return _textBuffer.CurrentSnapshot;
-            }
-
-            public bool Insert(int position, string text)
-            {
-                var initialSnapshot = (StringTextSnapshot)_textBuffer.CurrentSnapshot;
-                var newText = initialSnapshot.Content.Insert(position, text);
-                var changedSnapshot = new StringTextSnapshot(newText);
-                var edit = new TestEdit(position, 0, initialSnapshot, text.Length, changedSnapshot, text);
-                _edits.Add(edit);
-
-                return true;
-            }
-
-            public void Cancel() => throw new NotImplementedException();
-
-            public bool Delete(Span deleteSpan) => throw new NotImplementedException();
-
-            public bool Delete(int startPosition, int charsToDelete) => throw new NotImplementedException();
-
-            public void Dispose() => throw new NotImplementedException();
-
-            public bool Insert(int position, char[] characterBuffer, int startIndex, int length) => throw new NotImplementedException();
-
-            public bool Replace(Span replaceSpan, string replaceWith) => throw new NotImplementedException();
-
-            public bool Replace(int startPosition, int charsToReplace, string replaceWith) => throw new NotImplementedException();
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Infrastructure/TestTextChange.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Infrastructure/TestTextChange.cs
deleted file mode 100644
index 7b1167c2c586..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Infrastructure/TestTextChange.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.VisualStudio.Text;
-
-namespace Microsoft.VisualStudio.Test
-{
-    public class TestTextChange : ITextChange
-    {
-        public TestTextChange(TestEdit edit) : this(edit.Change)
-        {
-        }
-
-        public TestTextChange(SourceChange change)
-        {
-            var changeSpan = change.Span;
-
-            OldPosition = changeSpan.AbsoluteIndex;
-            NewPosition = OldPosition;
-            OldEnd = changeSpan.AbsoluteIndex + changeSpan.Length;
-            NewEnd = changeSpan.AbsoluteIndex + change.NewText.Length;
-        }
-
-        public int OldPosition { get; }
-
-        public int NewPosition { get; }
-
-        public int OldEnd { get; }
-
-        public int NewEnd { get; }
-
-        public Span OldSpan => throw new NotImplementedException();
-
-        public Span NewSpan => throw new NotImplementedException();
-
-        public int Delta => throw new NotImplementedException();
-
-        public string OldText => throw new NotImplementedException();
-
-        public string NewText => throw new NotImplementedException();
-
-        public int OldLength => throw new NotImplementedException();
-
-        public int NewLength => throw new NotImplementedException();
-
-        public int LineCountDelta => throw new NotImplementedException();
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj
deleted file mode 100644
index bf005a94782c..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj
+++ /dev/null
@@ -1,37 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
-    <PreserveCompilationContext>true</PreserveCompilationContext>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Microsoft.CodeAnalysis.Razor.Workspaces.Test\Shared\**\*.cs">
-      <Link>Shared\%(RecursiveDir)%(FileName)%(Extension)</Link>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj" />
-    <ProjectReference Include="..\Microsoft.VisualStudio.Editor.Razor.Test.Common\Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(VSIX_MicrosoftCodeAnalysisCommonPackageVersion)" />
-    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
-    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionProviderTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionProviderTest.cs
deleted file mode 100644
index 1b76f772b6ec..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionProviderTest.cs
+++ /dev/null
@@ -1,379 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.ComponentModel.Composition;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Completion;
-using Microsoft.CodeAnalysis.Options;
-using Microsoft.CodeAnalysis.Tags;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Text;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class RazorDirectiveCompletionProviderTest
-    {
-        private static readonly IReadOnlyList<DirectiveDescriptor> DefaultDirectives = new[]
-        {
-            CSharpCodeParser.AddTagHelperDirectiveDescriptor,
-            CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
-            CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
-        };
-
-        [Fact]
-        public void AtDirectiveCompletionPoint_ReturnsFalseIfChangeHasNoOwner()
-        {
-            // Arrange
-            var codeDocumentProvider = CreateCodeDocumentProvider("@", Enumerable.Empty<DirectiveDescriptor>());
-            var completionProvider = new FailOnGetCompletionsProvider(codeDocumentProvider);
-            var document = CreateDocument();
-            codeDocumentProvider.Value.TryGetFromDocument(document, out var codeDocument);
-            var syntaxTree = codeDocument.GetSyntaxTree();
-            var completionContext = CreateContext(2, completionProvider, document);
-
-            // Act
-            var result = completionProvider.AtDirectiveCompletionPoint(syntaxTree, completionContext);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public async Task GetDescriptionAsync_AddsDirectiveDescriptionIfPropertyExists()
-        {
-            // Arrange
-            var document = CreateDocument();
-            var expectedDescription = "The expected description";
-            var item = CompletionItem.Create("TestDirective")
-                .WithProperties((new Dictionary<string, string>()
-                {
-                    [RazorDirectiveCompletionProvider.DescriptionKey] = expectedDescription,
-                }).ToImmutableDictionary());
-            var codeDocumentProvider = new Mock<RazorCodeDocumentProvider>();
-            var completionProvider = new RazorDirectiveCompletionProvider(new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object));
-
-            // Act
-            var description = await completionProvider.GetDescriptionAsync(document, item, CancellationToken.None);
-
-            // Assert
-            var part = Assert.Single(description.TaggedParts);
-            Assert.Equal(TextTags.Text, part.Tag);
-            Assert.Equal(expectedDescription, part.Text);
-            Assert.Equal(expectedDescription, description.Text);
-        }
-
-        [Fact]
-        public async Task GetDescriptionAsync_DoesNotAddDescriptionWhenPropertyAbsent()
-        {
-            // Arrange
-            var document = CreateDocument();
-            var item = CompletionItem.Create("TestDirective");
-            var codeDocumentProvider = new Mock<RazorCodeDocumentProvider>();
-            var completionProvider = new RazorDirectiveCompletionProvider(new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object));
-
-            // Act
-            var description = await completionProvider.GetDescriptionAsync(document, item, CancellationToken.None);
-
-            // Assert
-            Assert.Empty(description.TaggedParts);
-            Assert.Equal(string.Empty, description.Text);
-        }
-
-        [Fact]
-        public async Task ProvideCompletionAsync_DoesNotProvideCompletionsForNonRazorFiles()
-        {
-            // Arrange
-            var codeDocumentProvider = new Mock<RazorCodeDocumentProvider>(MockBehavior.Strict);
-            var completionProvider = new FailOnGetCompletionsProvider(new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object));
-            var document = CreateDocument();
-            document = document.WithFilePath("NotRazor.cs");
-            var context = CreateContext(1, completionProvider, document);
-
-            // Act & Assert
-            await completionProvider.ProvideCompletionsAsync(context);
-        }
-
-
-        [Fact]
-        public async Task ProvideCompletionAsync_DoesNotProvideCompletionsForDocumentWithoutPath()
-        {
-            // Arrange
-            Document document = null;
-            TestWorkspace.Create(workspace =>
-            {
-                var project = ProjectInfo
-                .Create(ProjectId.CreateNewId(), VersionStamp.Default, "TestProject", "TestAssembly", LanguageNames.CSharp)
-                .WithFilePath("/TestProject.csproj");
-                workspace.AddProject(project);
-                var documentInfo = DocumentInfo.Create(DocumentId.CreateNewId(project.Id), "Test.cshtml");
-                document = workspace.AddDocument(documentInfo);
-            });
-
-            var codeDocumentProvider = new Mock<RazorCodeDocumentProvider>(MockBehavior.Strict);
-            var completionProvider = new FailOnGetCompletionsProvider(new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object));
-            var context = CreateContext(1, completionProvider, document);
-
-            // Act & Assert
-            await completionProvider.ProvideCompletionsAsync(context);
-        }
-
-        [Fact]
-        public async Task ProvideCompletionAsync_DoesNotProvideCompletionsWhenDocumentProviderCanNotGetDocument()
-        {
-            // Arrange
-            RazorCodeDocument codeDocument;
-            var codeDocumentProvider = new Mock<RazorCodeDocumentProvider>();
-            codeDocumentProvider.Setup(provider => provider.TryGetFromDocument(It.IsAny<TextDocument>(), out codeDocument))
-                .Returns(false);
-            var completionProvider = new FailOnGetCompletionsProvider(new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object));
-            var document = CreateDocument();
-            var context = CreateContext(1, completionProvider, document);
-
-            // Act & Assert
-            await completionProvider.ProvideCompletionsAsync(context);
-        }
-
-        [Fact]
-        public async Task ProvideCompletionAsync_DoesNotProvideCompletionsCanNotFindSnapshotPoint()
-        {
-            // Arrange
-            var codeDocumentProvider = CreateCodeDocumentProvider("@", Enumerable.Empty<DirectiveDescriptor>());
-            var completionProvider = new FailOnGetCompletionsProvider(codeDocumentProvider, false);
-            var document = CreateDocument();
-            var context = CreateContext(0, completionProvider, document);
-
-            // Act & Assert
-            await completionProvider.ProvideCompletionsAsync(context);
-        }
-
-        [Fact]
-        public async Task ProvideCompletionAsync_DoesNotProvideCompletionsWhenNotAtCompletionPoint()
-        {
-            // Arrange
-            var codeDocumentProvider = CreateCodeDocumentProvider("@", Enumerable.Empty<DirectiveDescriptor>());
-            var completionProvider = new FailOnGetCompletionsProvider(codeDocumentProvider);
-            var document = CreateDocument();
-            var context = CreateContext(0, completionProvider, document);
-
-            // Act & Assert
-            await completionProvider.ProvideCompletionsAsync(context);
-        }
-
-        [Theory]
-        [InlineData("DateTime.Now")]
-        [InlineData("SomeMethod()")]
-        public async Task ProvideCompletionAsync_DoesNotProvideCompletionsWhenAtComplexExpressions(string content)
-        {
-            // Arrange
-            var codeDocumentProvider = CreateCodeDocumentProvider("@" + content, Enumerable.Empty<DirectiveDescriptor>());
-            var completionProvider = new FailOnGetCompletionsProvider(codeDocumentProvider);
-            var document = CreateDocument();
-            var context = CreateContext(1, completionProvider, document);
-
-            // Act & Assert
-            await completionProvider.ProvideCompletionsAsync(context);
-        }
-
-        [Fact]
-        public async Task ProvideCompletionAsync_DoesNotProvideCompletionsForExplicitExpressions()
-        {
-            // Arrange
-            var codeDocumentProvider = CreateCodeDocumentProvider("@()", Enumerable.Empty<DirectiveDescriptor>());
-            var completionProvider = new FailOnGetCompletionsProvider(codeDocumentProvider);
-            var document = CreateDocument();
-            var context = CreateContext(2, completionProvider, document);
-
-            // Act & Assert
-            await completionProvider.ProvideCompletionsAsync(context);
-        }
-
-        [Fact]
-        public async Task ProvideCompletionAsync_DoesNotProvideCompletionsForCodeDocumentWithoutSyntaxTree()
-        {
-            // Arrange
-            var codeDocumentProvider = new Mock<RazorCodeDocumentProvider>();
-            var codeDocument = TestRazorCodeDocument.CreateEmpty();
-            codeDocumentProvider.Setup(provider => provider.TryGetFromDocument(It.IsAny<TextDocument>(), out codeDocument))
-                .Returns(true);
-            var completionProvider = new FailOnGetCompletionsProvider(new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object));
-            var document = CreateDocument();
-            var context = CreateContext(2, completionProvider, document);
-
-            // Act & Assert
-            await completionProvider.ProvideCompletionsAsync(context);
-        }
-
-        [Fact]
-        public void GetCompletionItems_ProvidesCompletionsForDefaultDirectives()
-        {
-            // Arrange
-            var codeDocumentProvider = CreateCodeDocumentProvider("@", Enumerable.Empty<DirectiveDescriptor>());
-            var completionProvider = new RazorDirectiveCompletionProvider(codeDocumentProvider);
-            var document = CreateDocument();
-            codeDocumentProvider.Value.TryGetFromDocument(document, out var codeDocument);
-            var syntaxTree = codeDocument.GetSyntaxTree();
-
-            // Act
-            var completionItems = completionProvider.GetCompletionItems(syntaxTree);
-
-            // Assert
-            Assert.Collection(
-                completionItems,
-                item => AssertRazorCompletionItem(DefaultDirectives[0].Description, item),
-                item => AssertRazorCompletionItem(DefaultDirectives[1].Description, item),
-                item => AssertRazorCompletionItem(DefaultDirectives[2].Description, item));
-        }
-
-        [Fact]
-        public void GetCompletionItems_ProvidesCompletionsForDefaultAndExtensibleDirectives()
-        {
-            // Arrange
-            var codeDocumentProvider = CreateCodeDocumentProvider("@", new[] { SectionDirective.Directive });
-            var completionProvider = new RazorDirectiveCompletionProvider(codeDocumentProvider);
-            var document = CreateDocument();
-            codeDocumentProvider.Value.TryGetFromDocument(document, out var codeDocument);
-            var syntaxTree = codeDocument.GetSyntaxTree();
-
-            // Act
-            var completionItems = completionProvider.GetCompletionItems(syntaxTree);
-
-            // Assert
-            Assert.Collection(
-                completionItems,
-                item => AssertRazorCompletionItem(SectionDirective.Directive.Description, item),
-                item => AssertRazorCompletionItem(DefaultDirectives[0].Description, item),
-                item => AssertRazorCompletionItem(DefaultDirectives[1].Description, item),
-                item => AssertRazorCompletionItem(DefaultDirectives[2].Description, item));
-        }
-
-        [Fact]
-        public void GetCompletionItems_ProvidesCompletionsForDirectivesWithoutDescription()
-        {
-            // Arrange
-            var customDirective = DirectiveDescriptor.CreateSingleLineDirective("custom");
-            var codeDocumentProvider = CreateCodeDocumentProvider("@", new[] { customDirective });
-            var completionProvider = new RazorDirectiveCompletionProvider(codeDocumentProvider);
-            var document = CreateDocument();
-            codeDocumentProvider.Value.TryGetFromDocument(document, out var codeDocument);
-            var syntaxTree = codeDocument.GetSyntaxTree();
-
-            // Act
-            var completionItems = completionProvider.GetCompletionItems(syntaxTree);
-
-            // Assert
-            var customDirectiveCompletion = Assert.Single(completionItems, item => item.DisplayText == customDirective.Directive);
-            AssertRazorCompletionItemDefaults(customDirectiveCompletion);
-            Assert.DoesNotContain(customDirectiveCompletion.Properties, property => property.Key == RazorDirectiveCompletionProvider.DescriptionKey);
-        }
-
-        private static void AssertRazorCompletionItem(string expectedDescription, CompletionItem item)
-        {
-            Assert.True(item.Properties.TryGetValue(RazorDirectiveCompletionProvider.DescriptionKey, out var actualDescription));
-            Assert.Equal(expectedDescription, actualDescription);
-
-            AssertRazorCompletionItemDefaults(item);
-        }
-
-        private static void AssertRazorCompletionItemDefaults(CompletionItem item)
-        {
-            Assert.Equal("_RazorDirective_", item.SortText);
-            Assert.False(item.Rules.FormatOnCommit);
-            var tag = Assert.Single(item.Tags);
-            Assert.Equal(WellKnownTags.Intrinsic, tag);
-        }
-
-        private static Lazy<RazorCodeDocumentProvider> CreateCodeDocumentProvider(string text, IEnumerable<DirectiveDescriptor> directives)
-        {
-            var codeDocumentProvider = new Mock<RazorCodeDocumentProvider>();
-            var codeDocument = TestRazorCodeDocument.CreateEmpty();
-            var sourceDocument = TestRazorSourceDocument.Create(text);
-            var options = RazorParserOptions.Create(builder =>
-            {
-                foreach (var directive in directives)
-                {
-                    builder.Directives.Add(directive);
-                }
-            });
-            var syntaxTree = RazorSyntaxTree.Parse(sourceDocument, options);
-            codeDocument.SetSyntaxTree(syntaxTree);
-            codeDocumentProvider.Setup(provider => provider.TryGetFromDocument(It.IsAny<TextDocument>(), out codeDocument))
-                .Returns(true);
-
-            return new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object);
-        }
-
-        private static CompletionContext CreateContext(int position, RazorDirectiveCompletionProvider completionProvider, Document document)
-        {
-            var context = new CompletionContext(
-                completionProvider,
-                document,
-                position,
-                TextSpan.FromBounds(position, position),
-                CompletionTrigger.Invoke,
-                new Mock<OptionSet>().Object,
-                CancellationToken.None);
-
-            return context;
-        }
-
-        private static Document CreateDocument()
-        {
-            Document document = null;
-            TestWorkspace.Create(workspace =>
-            {
-                var project = ProjectInfo
-                .Create(ProjectId.CreateNewId(), VersionStamp.Default, "TestProject", "TestAssembly", LanguageNames.CSharp)
-                .WithFilePath("/TestProject.csproj");
-                workspace.AddProject(project);
-                var documentInfo = DocumentInfo.Create(DocumentId.CreateNewId(project.Id), "Test.cshtml");
-                document = workspace.AddDocument(documentInfo);
-                document = document.WithFilePath("Test.cshtml");
-            });
-
-            return document;
-        }
-
-        private class FailOnGetCompletionsProvider : RazorDirectiveCompletionProvider
-        {
-            private readonly bool _canGetSnapshotPoint;
-
-            public FailOnGetCompletionsProvider(Lazy<RazorCodeDocumentProvider> codeDocumentProvider, bool canGetSnapshotPoint = true)
-                : base(codeDocumentProvider)
-            {
-                _canGetSnapshotPoint = canGetSnapshotPoint;
-            }
-
-            internal override IEnumerable<CompletionItem> GetCompletionItems(RazorSyntaxTree syntaxTree)
-            {
-                Assert.False(true, "Completions should not have been attempted.");
-                return null;
-            }
-
-            protected override bool TryGetRazorSnapshotPoint(CompletionContext context, out SnapshotPoint snapshotPoint)
-            {
-                if (!_canGetSnapshotPoint)
-                {
-                    snapshotPoint = default(SnapshotPoint);
-                    return false;
-                }
-
-                var snapshot = new Mock<ITextSnapshot>(MockBehavior.Strict);
-                snapshot.Setup(s => s.Length)
-                    .Returns(context.CompletionListSpan.End);
-                snapshotPoint = new SnapshotPoint(snapshot.Object, context.CompletionListSpan.Start);
-                return true;
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorSyntaxFactsServiceExtensionsTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorSyntaxFactsServiceExtensionsTest.cs
deleted file mode 100644
index 9d8e28b49f8a..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorSyntaxFactsServiceExtensionsTest.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class RazorSyntaxFactsServiceExtensionsTest
-    {
-        [Fact]
-        public void IsTagHelperSpan_ReturnsTrue()
-        {
-            // Arrange
-            var syntaxTree = GetSyntaxTree(
-@"<div>
-    <taghelper />
-</div>");
-            var location = new SourceSpan(9 + Environment.NewLine.Length, 13);
-            var service = new DefaultRazorSyntaxFactsService();
-
-            // Act
-            var result = service.IsTagHelperSpan(syntaxTree, location);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void IsTagHelperSpan_ReturnsFalse()
-        {
-            // Arrange
-            var syntaxTree = GetSyntaxTree(
-@"<div>
-    <taghelper></taghelper>
-</div>");
-            var location = new SourceSpan(0, 4);
-            var service = new DefaultRazorSyntaxFactsService();
-
-            // Act
-            var result = service.IsTagHelperSpan(syntaxTree, location);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void IsTagHelperSpan_NullSyntaxTree_ReturnsFalse()
-        {
-            // Arrange
-            var location = new SourceSpan(0, 4);
-            var service = new DefaultRazorSyntaxFactsService();
-
-            // Act
-            var result = service.IsTagHelperSpan(null, location);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        private static RazorSyntaxTree GetSyntaxTree(string source)
-        {
-            var taghelper = TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
-                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("taghelper"))
-                .TypeName("TestTagHelper")
-                .Build();
-            var projectEngine = RazorProjectEngine.Create(builder =>
-            {
-                builder.AddTagHelpers(taghelper);
-                builder.Features.Add(new DesignTimeOptionsFeature(designTime: true));
-            });
-
-            var sourceDocument = RazorSourceDocument.Create(source, "test.cshtml");
-            var addTagHelperImport = RazorSourceDocument.Create("@addTagHelper *, TestAssembly", "import.cshtml");
-            var codeDocument = RazorCodeDocument.Create(sourceDocument, new[] { addTagHelperImport });
-
-            projectEngine.Engine.Process(codeDocument);
-
-            return codeDocument.GetSyntaxTree();
-        }
-
-        private class DesignTimeOptionsFeature : IConfigureRazorParserOptionsFeature, IConfigureRazorCodeGenerationOptionsFeature
-        {
-            private bool _designTime;
-
-            public DesignTimeOptionsFeature(bool designTime)
-            {
-                _designTime = designTime;
-            }
-
-            public int Order { get; }
-
-            public RazorEngine Engine { get; set; }
-
-            public void Configure(RazorParserOptionsBuilder options)
-            {
-                options.SetDesignTime(_designTime);
-            }
-
-            public void Configure(RazorCodeGenerationOptionsBuilder options)
-            {
-                options.SetDesignTime(_designTime);
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorSyntaxTreePartialParserTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorSyntaxTreePartialParserTest.cs
deleted file mode 100644
index 8b5ee4ef5a9b..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorSyntaxTreePartialParserTest.cs
+++ /dev/null
@@ -1,603 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Mvc.Razor.Extensions;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Microsoft.VisualStudio.Test;
-using Microsoft.VisualStudio.Text;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class RazorSyntaxTreePartialParserTest
-    {
-        public static TheoryData TagHelperPartialParseRejectData
-        {
-            get
-            {
-                return new TheoryData<TestEdit>
-                {
-                    CreateInsertionChange("<p></p>", 2, " "),
-                    CreateInsertionChange("<p></p>", 6, " "),
-                    CreateInsertionChange("<p some-attr></p>", 12, " "),
-                    CreateInsertionChange("<p some-attr></p>", 12, "ibute"),
-                    CreateInsertionChange("<p some-attr></p>", 2, " before"),
-                };
-            }
-        }
-
-        [Theory]
-        [MemberData(nameof(TagHelperPartialParseRejectData))]
-        public void TagHelperTagBodiesRejectPartialChanges(object objectEdit)
-        {
-            // Arrange
-            var edit = (TestEdit)objectEdit;
-            var builder = TagHelperDescriptorBuilder.Create("PTagHelper", "TestAssembly");
-            builder.SetTypeName("PTagHelper");
-            builder.TagMatchingRule(rule => rule.TagName = "p");
-            var descriptors = new[]
-            {
-                builder.Build()
-            };
-            var projectEngine = CreateProjectEngine(tagHelpers: descriptors);
-            var projectItem = new TestRazorProjectItem("Index.cshtml")
-            {
-                Content = edit.OldSnapshot.GetText()
-            };
-            var codeDocument = projectEngine.Process(projectItem);
-            var syntaxTree = codeDocument.GetSyntaxTree();
-            var parser = new RazorSyntaxTreePartialParser(syntaxTree);
-
-            // Act
-            var result = parser.Parse(edit.Change);
-
-            // Assert
-            Assert.Equal(PartialParseResultInternal.Rejected, result);
-        }
-
-        public static TheoryData TagHelperAttributeAcceptData
-        {
-            get
-            {
-                var factory = new SpanFactory();
-
-                // change, (Block)expectedDocument, partialParseResult
-                return new TheoryData<TestEdit, PartialParseResultInternal>
-                {
-                    {
-                        CreateInsertionChange("<p str-attr='@DateTime'></p>", 22, "."),
-                        PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional
-                    },
-                    {
-                        CreateInsertionChange("<p obj-attr='DateTime'></p>", 21, "."),
-                        PartialParseResultInternal.Accepted
-                    },
-                    {
-                        CreateInsertionChange("<p obj-attr='1 + DateTime'></p>", 25, "."),
-                        PartialParseResultInternal.Accepted
-                    },
-                    {
-                        CreateInsertionChange("<p before-attr str-attr='@DateTime' after-attr></p>", 34, "."),
-                        PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional
-                    },
-                    {
-                        CreateInsertionChange("<p str-attr='before @DateTime after'></p>", 29, "."),
-                        PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional
-                    },
-                };
-            }
-        }
-
-        [Theory]
-        [MemberData(nameof(TagHelperAttributeAcceptData))]
-        public void TagHelperAttributesAreLocatedAndAcceptChangesCorrectly(object editObject, object partialParseResultObject)
-        {
-            // Arrange
-            var edit = (TestEdit)editObject;
-            var partialParseResult = (PartialParseResultInternal)partialParseResultObject;
-            var builder = TagHelperDescriptorBuilder.Create("PTagHelper", "Test");
-            builder.SetTypeName("PTagHelper");
-            builder.TagMatchingRule(rule => rule.TagName = "p");
-            builder.BindAttribute(attribute =>
-            {
-                attribute.Name = "obj-attr";
-                attribute.TypeName = typeof(object).FullName;
-                attribute.SetPropertyName("ObjectAttribute");
-            });
-            builder.BindAttribute(attribute =>
-            {
-                attribute.Name = "str-attr";
-                attribute.TypeName = typeof(string).FullName;
-                attribute.SetPropertyName("StringAttribute");
-            });
-            var descriptors = new[] { builder.Build() };
-            var projectEngine = CreateProjectEngine(tagHelpers: descriptors);
-            var sourceDocument = new TestRazorProjectItem("Index.cshtml")
-            {
-                Content = edit.OldSnapshot.GetText()
-            };
-            var codeDocument = projectEngine.Process(sourceDocument);
-            var syntaxTree = codeDocument.GetSyntaxTree();
-            var parser = new RazorSyntaxTreePartialParser(syntaxTree);
-
-            // Act
-            var result = parser.Parse(edit.Change);
-
-            // Assert
-            Assert.Equal(partialParseResult, result);
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsInnerInsertionsInStatementBlock()
-        {
-            // Arrange
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("@{" + Environment.NewLine
-                                                    + "    @DateTime..Now" + Environment.NewLine
-                                                    + "}");
-            var old = new StringTextSnapshot("@{" + Environment.NewLine
-                                                + "    @DateTime.Now" + Environment.NewLine
-                                                + "}");
-
-            // Act and Assert
-            RunPartialParseTest(new TestEdit(17, 0, old, 1, changed, "."),
-                new MarkupBlock(
-                    factory.EmptyHtml(),
-                    new StatementBlock(
-                        factory.CodeTransition(),
-                        factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                        factory.Code(Environment.NewLine + "    ")
-                            .AsStatement()
-                            .AutoCompleteWith(autoCompleteString: null),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("DateTime..Now")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Code(Environment.NewLine).AsStatement(),
-                        factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                    factory.EmptyHtml()));
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsInnerInsertions()
-        {
-            // Arrange
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("foo @DateTime..Now baz");
-            var old = new StringTextSnapshot("foo @DateTime.Now baz");
-
-            // Act and Assert
-            RunPartialParseTest(new TestEdit(13, 0, old, 1, changed, "."),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime..Now").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")), additionalFlags: PartialParseResultInternal.Provisional);
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsWholeIdentifierReplacement()
-        {
-            // Arrange
-            var factory = new SpanFactory();
-            var old = new StringTextSnapshot("foo @date baz");
-            var changed = new StringTextSnapshot("foo @DateTime baz");
-
-            // Act and Assert
-            RunPartialParseTest(new TestEdit(5, 4, old, 8, changed, "DateTime"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
-        }
-
-        [Fact]
-        public void ImplicitExpressionRejectsWholeIdentifierReplacementToKeyword()
-        {
-            // Arrange
-            var old = new StringTextSnapshot("foo @date baz");
-            var changed = new StringTextSnapshot("foo @if baz");
-            var edit = new TestEdit(5, 4, old, 2, changed, "if");
-
-            // Act & Assert
-            RunPartialParseRejectionTest(edit);
-        }
-
-        [Fact]
-        public void ImplicitExpressionRejectsWholeIdentifierReplacementToDirective()
-        {
-            // Arrange
-            var old = new StringTextSnapshot("foo @date baz");
-            var changed = new StringTextSnapshot("foo @inherits baz");
-            var edit = new TestEdit(5, 4, old, 8, changed, "inherits");
-
-            // Act & Assert
-            RunPartialParseRejectionTest(edit, PartialParseResultInternal.SpanContextChanged);
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsPrefixIdentifierReplacements_SingleSymbol()
-        {
-            // Arrange
-            var factory = new SpanFactory();
-            var old = new StringTextSnapshot("foo @dTime baz");
-            var changed = new StringTextSnapshot("foo @DateTime baz");
-
-            // Act and Assert
-            RunPartialParseTest(new TestEdit(5, 1, old, 4, changed, "Date"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsPrefixIdentifierReplacements_MultipleSymbols()
-        {
-            // Arrange
-            var factory = new SpanFactory();
-            var old = new StringTextSnapshot("foo @dTime.Now baz");
-            var changed = new StringTextSnapshot("foo @DateTime.Now baz");
-
-            // Act and Assert
-            RunPartialParseTest(new TestEdit(5, 1, old, 4, changed, "Date"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime.Now").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsSuffixIdentifierReplacements_SingleSymbol()
-        {
-            // Arrange
-            var factory = new SpanFactory();
-            var old = new StringTextSnapshot("foo @Datet baz");
-            var changed = new StringTextSnapshot("foo @DateTime baz");
-
-            // Act and Assert
-            RunPartialParseTest(new TestEdit(9, 1, old, 4, changed, "Time"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsSuffixIdentifierReplacements_MultipleSymbols()
-        {
-            // Arrange
-            var factory = new SpanFactory();
-            var old = new StringTextSnapshot("foo @DateTime.n baz");
-            var changed = new StringTextSnapshot("foo @DateTime.Now baz");
-
-            // Act and Assert
-            RunPartialParseTest(new TestEdit(14, 1, old, 3, changed, "Now"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime.Now").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsSurroundedIdentifierReplacements()
-        {
-            // Arrange
-            var factory = new SpanFactory();
-            var old = new StringTextSnapshot("foo @DateTime.n.ToString() baz");
-            var changed = new StringTextSnapshot("foo @DateTime.Now.ToString() baz");
-
-            // Act and Assert
-            RunPartialParseTest(new TestEdit(14, 1, old, 3, changed, "Now"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime.Now.ToString()").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
-        }
-
-        [Fact]
-        public void ImplicitExpressionProvisionallyAcceptsDeleteOfIdentifierPartsIfDotRemains()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("foo @User. baz");
-            var old = new StringTextSnapshot("foo @User.Name baz");
-            RunPartialParseTest(new TestEdit(10, 4, old, 0, changed, string.Empty),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("User.").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")),
-                additionalFlags: PartialParseResultInternal.Provisional);
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsDeleteOfIdentifierPartsIfSomeOfIdentifierRemains()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("foo @Us baz");
-            var old = new StringTextSnapshot("foo @User baz");
-            RunPartialParseTest(new TestEdit(7, 2, old, 0, changed, string.Empty),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("Us").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
-        }
-
-        [Fact]
-        public void ImplicitExpressionProvisionallyAcceptsMultipleInsertionIfItCausesIdentifierExpansionAndTrailingDot()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("foo @User. baz");
-            var old = new StringTextSnapshot("foo @U baz");
-            RunPartialParseTest(new TestEdit(6, 0, old, 4, changed, "ser."),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("User.").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")),
-                additionalFlags: PartialParseResultInternal.Provisional);
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsMultipleInsertionIfItOnlyCausesIdentifierExpansion()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("foo @barbiz baz");
-            var old = new StringTextSnapshot("foo @bar baz");
-            RunPartialParseTest(new TestEdit(8, 0, old, 3, changed, "biz"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("barbiz").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsIdentifierExpansionAtEndOfNonWhitespaceCharacters()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("@{" + Environment.NewLine
-                                                    + "    @food" + Environment.NewLine
-                                                    + "}");
-            var old = new StringTextSnapshot("@{" + Environment.NewLine
-                                                + "    @foo" + Environment.NewLine
-                                                + "}");
-            RunPartialParseTest(new TestEdit(10 + Environment.NewLine.Length, 0, old, 1, changed, "d"),
-                new MarkupBlock(
-                    factory.EmptyHtml(),
-                    new StatementBlock(
-                        factory.CodeTransition(),
-                        factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                        factory.Code(Environment.NewLine + "    ")
-                            .AsStatement()
-                            .AutoCompleteWith(autoCompleteString: null),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("food")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Code(Environment.NewLine).AsStatement(),
-                        factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                    factory.EmptyHtml()));
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsIdentifierAfterDotAtEndOfNonWhitespaceCharacters()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("@{" + Environment.NewLine
-                                                    + "    @foo.d" + Environment.NewLine
-                                                    + "}");
-            var old = new StringTextSnapshot("@{" + Environment.NewLine
-                                                + "    @foo." + Environment.NewLine
-                                                + "}");
-            RunPartialParseTest(new TestEdit(11 + Environment.NewLine.Length, 0, old, 1, changed, "d"),
-                new MarkupBlock(
-                    factory.EmptyHtml(),
-                    new StatementBlock(
-                        factory.CodeTransition(),
-                        factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                        factory.Code(Environment.NewLine + "    ")
-                            .AsStatement()
-                            .AutoCompleteWith(autoCompleteString: null),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("foo.d")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Code(Environment.NewLine).AsStatement(),
-                        factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                    factory.EmptyHtml()));
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsDotAtEndOfNonWhitespaceCharacters()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("@{" + Environment.NewLine
-                                                    + "    @foo." + Environment.NewLine
-                                                    + "}");
-            var old = new StringTextSnapshot("@{" + Environment.NewLine
-                                                + "    @foo" + Environment.NewLine
-                                                + "}");
-            RunPartialParseTest(new TestEdit(10 + Environment.NewLine.Length, 0, old, 1, changed, "."),
-                new MarkupBlock(
-                    factory.EmptyHtml(),
-                    new StatementBlock(
-                        factory.CodeTransition(),
-                        factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                        factory.Code(Environment.NewLine + "    ")
-                            .AsStatement()
-                            .AutoCompleteWith(autoCompleteString: null),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code(@"foo.")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Code(Environment.NewLine).AsStatement(),
-                        factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                    factory.EmptyHtml()));
-        }
-
-        [Fact]
-        public void ImplicitExpressionProvisionallyAcceptsDotAfterIdentifierInMarkup()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("foo @foo. bar");
-            var old = new StringTextSnapshot("foo @foo bar");
-            RunPartialParseTest(new TestEdit(8, 0, old, 1, changed, "."),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("foo.")
-                               .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                               .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" bar")),
-                additionalFlags: PartialParseResultInternal.Provisional);
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsAdditionalIdentifierCharactersIfEndOfSpanIsIdentifier()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("foo @foob bar");
-            var old = new StringTextSnapshot("foo @foo bar");
-            RunPartialParseTest(new TestEdit(8, 0, old, 1, changed, "b"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("foob")
-                               .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                               .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" bar")));
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsAdditionalIdentifierStartCharactersIfEndOfSpanIsDot()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("@{@foo.b}");
-            var old = new StringTextSnapshot("@{@foo.}");
-            RunPartialParseTest(new TestEdit(7, 0, old, 1, changed, "b"),
-                new MarkupBlock(
-                    factory.EmptyHtml(),
-                    new StatementBlock(
-                        factory.CodeTransition(),
-                        factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                        factory.EmptyCSharp()
-                            .AsStatement()
-                            .AutoCompleteWith(autoCompleteString: null),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("foo.b")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.EmptyCSharp().AsStatement(),
-                        factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                    factory.EmptyHtml()));
-        }
-
-        [Fact]
-        public void ImplicitExpressionAcceptsDotIfTrailingDotsAreAllowed()
-        {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("@{@foo.}");
-            var old = new StringTextSnapshot("@{@foo}");
-            RunPartialParseTest(new TestEdit(6, 0, old, 1, changed, "."),
-                new MarkupBlock(
-                    factory.EmptyHtml(),
-                    new StatementBlock(
-                        factory.CodeTransition(),
-                        factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                        factory.EmptyCSharp()
-                            .AsStatement()
-                            .AutoCompleteWith(autoCompleteString: null),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("foo.")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.EmptyCSharp().AsStatement(),
-                        factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                    factory.EmptyHtml()));
-        }
-
-        private void RunPartialParseRejectionTest(TestEdit edit, PartialParseResultInternal additionalFlags = 0)
-        {
-            var templateEngine = CreateProjectEngine();
-            var document = TestRazorCodeDocument.Create(edit.OldSnapshot.GetText());
-            templateEngine.Engine.Process(document);
-            var syntaxTree = document.GetSyntaxTree();
-            var parser = new RazorSyntaxTreePartialParser(syntaxTree);
-
-            var result = parser.Parse(edit.Change);
-            Assert.Equal(PartialParseResultInternal.Rejected | additionalFlags, result);
-        }
-
-        private static void RunPartialParseTest(TestEdit edit, Block expectedTree, PartialParseResultInternal additionalFlags = 0)
-        {
-            var templateEngine = CreateProjectEngine();
-            var document = TestRazorCodeDocument.Create(edit.OldSnapshot.GetText());
-            templateEngine.Engine.Process(document);
-            var syntaxTree = document.GetSyntaxTree();
-            var parser = new RazorSyntaxTreePartialParser(syntaxTree);
-
-            var result = parser.Parse(edit.Change);
-            Assert.Equal(PartialParseResultInternal.Accepted | additionalFlags, result);
-            ParserTestBase.EvaluateParseTree(parser.SyntaxTreeRoot, expectedTree);
-        }
-
-        private static TestEdit CreateInsertionChange(string initialText, int insertionLocation, string insertionText)
-        {
-            var changedText = initialText.Insert(insertionLocation, insertionText);
-            var sourceChange = new SourceChange(insertionLocation, 0, insertionText);
-            var oldSnapshot = new StringTextSnapshot(initialText);
-            var changedSnapshot = new StringTextSnapshot(changedText);
-            return new TestEdit(sourceChange, oldSnapshot, changedSnapshot);
-        }
-
-        private static RazorProjectEngine CreateProjectEngine(
-            string path = "C:\\This\\Path\\Is\\Just\\For\\Line\\Pragmas.cshtml",
-            IEnumerable<TagHelperDescriptor> tagHelpers = null)
-        {
-            var fileSystem = new TestRazorProjectFileSystem();
-            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem, builder =>
-            {
-                RazorExtensions.Register(builder);
-
-                builder.AddDefaultImports("@addTagHelper *, Test");
-
-                if (tagHelpers != null)
-                {
-                    builder.AddTagHelpers(tagHelpers);
-                }
-            });
-
-            return projectEngine;
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorTextViewConnectionListenerTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorTextViewConnectionListenerTest.cs
deleted file mode 100644
index d032aad935ad..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorTextViewConnectionListenerTest.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.ObjectModel;
-using Microsoft.CodeAnalysis;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor
-{
-    public class RazorTextViewConnectionListenerTest : ForegroundDispatcherTestBase
-    {
-        [ForegroundFact]
-        public void SubjectBuffersConnected_CallsRazorDocumentManager_OnTextViewOpened()
-        {
-            // Arrange
-            var textView = Mock.Of<ITextView>();
-            var buffers = new Collection<ITextBuffer>();
-            var documentManager = new Mock<RazorDocumentManager>(MockBehavior.Strict);
-            documentManager.Setup(d => d.OnTextViewOpened(textView, buffers)).Verifiable();
-
-            var listener = new RazorTextViewConnectionListener(Dispatcher, documentManager.Object);
-
-            // Act
-            listener.SubjectBuffersConnected(textView, ConnectionReason.BufferGraphChange, buffers);
-
-            // Assert
-            documentManager.Verify();
-        }
-
-        [ForegroundFact]
-        public void SubjectBuffersDisonnected_CallsRazorDocumentManager_OnTextViewClosed()
-        {
-            // Arrange
-            var textView = Mock.Of<ITextView>();
-            var buffers = new Collection<ITextBuffer>();
-            var documentManager = new Mock<RazorDocumentManager>(MockBehavior.Strict);
-            documentManager.Setup(d => d.OnTextViewClosed(textView, buffers)).Verifiable();
-
-            var listener = new RazorTextViewConnectionListener(Dispatcher, documentManager.Object);
-
-            // Act
-            listener.SubjectBuffersDisconnected(textView, ConnectionReason.BufferGraphChange, buffers);
-
-            // Assert
-            documentManager.Verify();
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TextContentChangedEventArgsExtensionsTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TextContentChangedEventArgsExtensionsTest.cs
deleted file mode 100644
index 4882a49a13c8..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TextContentChangedEventArgsExtensionsTest.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.VisualStudio.Test;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Text
-{
-    public class TextContentChangedEventArgsExtensionsTest
-    {
-        [Fact]
-        public void TextChangeOccurred_NoChanges_ReturnsFalse()
-        {
-            // Arrange
-            var before = new StringTextSnapshot(string.Empty);
-            var after = new StringTextSnapshot(string.Empty);
-            var testArgs = new TestTextContentChangedEventArgs(before, after);
-
-            // Act
-            var result = testArgs.TextChangeOccurred(out var changeInformation);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TextChangeOccurred_CancelingChanges_ReturnsFalse()
-        {
-            // Arrange
-            var before = new StringTextSnapshot("by");
-            before.Version.Changes.Add(new TestTextChange(new SourceChange(0, 2, "hi")));
-            before.Version.Changes.Add(new TestTextChange(new SourceChange(0, 2, "by")));
-            var after = new StringTextSnapshot("by");
-            var testArgs = new TestTextContentChangedEventArgs(before, after);
-
-            // Act
-            var result = testArgs.TextChangeOccurred(out var changeInformation);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TextChangeOccurred_SingleChange_ReturnsTrue()
-        {
-            // Arrange
-            var before = new StringTextSnapshot("by");
-            var firstChange = new TestTextChange(new SourceChange(0, 2, "hi"));
-            before.Version.Changes.Add(firstChange);
-            var after = new StringTextSnapshot("hi");
-            var testArgs = new TestTextContentChangedEventArgs(before, after);
-
-            // Act
-            var result = testArgs.TextChangeOccurred(out var changeInformation);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(firstChange, changeInformation.firstChange);
-            Assert.Equal(firstChange, changeInformation.lastChange);
-            Assert.Equal("hi", changeInformation.newText);
-            Assert.Equal("by", changeInformation.oldText);
-        }
-
-        [Fact]
-        public void TextChangeOccurred_MultipleChanges_ReturnsTrue()
-        {
-            // Arrange
-            var before = new StringTextSnapshot("by by");
-            var firstChange = new TestTextChange(new SourceChange(0, 2, "hi"));
-            before.Version.Changes.Add(firstChange);
-            var lastChange = new TestTextChange(new SourceChange(3, 2, "hi"));
-            before.Version.Changes.Add(lastChange);
-            var after = new StringTextSnapshot("hi hi");
-            var testArgs = new TestTextContentChangedEventArgs(before, after);
-
-            // Act
-            var result = testArgs.TextChangeOccurred(out var changeInformation);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(firstChange, changeInformation.firstChange);
-            Assert.Equal(lastChange, changeInformation.lastChange);
-            Assert.Equal("hi hi", changeInformation.newText);
-            Assert.Equal("by by", changeInformation.oldText);
-        }
-
-        private class TestTextContentChangedEventArgs : TextContentChangedEventArgs
-        {
-            public TestTextContentChangedEventArgs(ITextSnapshot before, ITextSnapshot after)
-                : base(before, after, EditOptions.DefaultMinimalChange, null)
-            {
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/xunit.runner.json b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/xunit.runner.json
deleted file mode 100644
index fcf172c8fc42..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/xunit.runner.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "methodDisplay": "method",
-  "shadowCopy": false
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DefaultVisualStudioWorkspaceAccessorTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DefaultVisualStudioWorkspaceAccessorTest.cs
deleted file mode 100644
index 4905f8572d0a..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DefaultVisualStudioWorkspaceAccessorTest.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.ObjectModel;
-using Microsoft.CodeAnalysis;
-using Microsoft.VisualStudio.Editor.Razor;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Projection;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor
-{
-    public class DefaultVisualStudioWorkspaceAccessorTest
-    {
-        private static readonly LiveShareWorkspaceProvider NoLiveShare = null;
-
-        [Fact]
-        public void TryGetWorkspace_PrioritizesLiveShareWhenResolvingWorkspaces()
-        {
-            // Arrange
-            var expectedWorkspace = TestWorkspace.Create();
-            var liveShareWorkspaceProvider = new Mock<LiveShareWorkspaceProvider>();
-            liveShareWorkspaceProvider.Setup(provider => provider.TryGetWorkspace(It.IsAny<ITextBuffer>(), out expectedWorkspace))
-                .Returns(true);
-            var workspaceAccessor = new TestWorkspaceAccessor(canGetWorkspaceFromProjectionBuffer: true, canGetWorkspaceFromHostProject: true, liveShareWorkspaceProvider.Object);
-            var textBuffer = Mock.Of<ITextBuffer>();
-
-            // Act
-            var result = workspaceAccessor.TryGetWorkspace(textBuffer, out var workspace);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(expectedWorkspace, workspace);
-        }
-
-        [Fact]
-        public void TryGetWorkspace_CanGetWorkspaceFromProjectionBuffersOnly()
-        {
-            // Arrange
-            var textBuffer = Mock.Of<ITextBuffer>();
-            var workspaceAccessor = new TestWorkspaceAccessor(true, false);
-
-            // Act
-            var result = workspaceAccessor.TryGetWorkspace(textBuffer, out var workspace);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void TryGetWorkspace_CanGetWorkspaceFromBuffersInHierarchyOnly()
-        {
-            // Arrange
-            var textBuffer = Mock.Of<ITextBuffer>();
-            var workspaceAccessor = new TestWorkspaceAccessor(false, true);
-
-            // Act
-            var result = workspaceAccessor.TryGetWorkspace(textBuffer, out var workspace);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void TryGetWorkspace_CanGetWorkspaceFromBuffersInHierarchyOrProjectionBuffers()
-        {
-            // Arrange
-            var textBuffer = Mock.Of<ITextBuffer>();
-            var workspaceAccessor = new TestWorkspaceAccessor(true, true);
-
-            // Act
-            var result = workspaceAccessor.TryGetWorkspace(textBuffer, out var workspace);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        [Fact]
-        public void TryGetWorkspaceFromLiveShare_NoLiveShareProvider_ReturnsFalse()
-        {
-            // Arrange
-            var workspaceAccessor = new DefaultVisualStudioWorkspaceAccessor(Mock.Of<IBufferGraphFactoryService>(), Mock.Of<TextBufferProjectService>(), TestWorkspace.Create(), NoLiveShare);
-            var textBuffer = Mock.Of<ITextBuffer>();
-
-            // Act
-            var result = workspaceAccessor.TryGetWorkspaceFromLiveShare(textBuffer, out var workspace);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TryGetWorkspaceFromLiveShare_CanNotFindWorkspace_ReturnsFalse()
-        {
-            // Arrange
-            Workspace nullWorkspace = null;
-            var liveShareWorkspaceProvider = new Mock<LiveShareWorkspaceProvider>();
-            liveShareWorkspaceProvider.Setup(provider => provider.TryGetWorkspace(It.IsAny<ITextBuffer>(), out nullWorkspace))
-                .Returns(false);
-            var workspaceAccessor = new DefaultVisualStudioWorkspaceAccessor(Mock.Of<IBufferGraphFactoryService>(), Mock.Of<TextBufferProjectService>(), TestWorkspace.Create(), liveShareWorkspaceProvider.Object);
-            var textBuffer = Mock.Of<ITextBuffer>();
-
-            // Act
-            var result = workspaceAccessor.TryGetWorkspaceFromLiveShare(textBuffer, out var workspace);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TryGetWorkspaceFromLiveShare_CanFindWorkspace_ReturnsTrue()
-        {
-            // Arrange
-            var expectedWorkspace = TestWorkspace.Create();
-            var liveShareWorkspaceProvider = new Mock<LiveShareWorkspaceProvider>();
-            liveShareWorkspaceProvider.Setup(provider => provider.TryGetWorkspace(It.IsAny<ITextBuffer>(), out expectedWorkspace))
-                .Returns(true);
-            var workspaceAccessor = new DefaultVisualStudioWorkspaceAccessor(Mock.Of<IBufferGraphFactoryService>(), Mock.Of<TextBufferProjectService>(), TestWorkspace.Create(), liveShareWorkspaceProvider.Object);
-            var textBuffer = Mock.Of<ITextBuffer>();
-
-            // Act
-            var result = workspaceAccessor.TryGetWorkspaceFromLiveShare(textBuffer, out var workspace);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(expectedWorkspace, workspace);
-        }
-
-        [Fact]
-        public void TryGetWorkspaceFromProjectionBuffer_NoProjectionBuffer_ReturnsFalse()
-        {
-            // Arrange
-            var bufferGraph = new Mock<IBufferGraph>();
-            bufferGraph.Setup(graph => graph.GetTextBuffers(It.IsAny<Predicate<ITextBuffer>>()))
-                .Returns<Predicate<ITextBuffer>>(predicate => new Collection<ITextBuffer>());
-            var bufferGraphService = new Mock<IBufferGraphFactoryService>();
-            bufferGraphService.Setup(service => service.CreateBufferGraph(It.IsAny<ITextBuffer>()))
-                .Returns(bufferGraph.Object);
-            var workspaceAccessor = new DefaultVisualStudioWorkspaceAccessor(bufferGraphService.Object, Mock.Of<TextBufferProjectService>(), TestWorkspace.Create(), NoLiveShare);
-            var textBuffer = Mock.Of<ITextBuffer>();
-
-            // Act
-            var result = workspaceAccessor.TryGetWorkspaceFromProjectionBuffer(textBuffer, out var workspace);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TryGetWorkspaceFromHostProject_NoHostProject_ReturnsFalse()
-        {
-            // Arrange
-            var workspaceAccessor = new DefaultVisualStudioWorkspaceAccessor(Mock.Of<IBufferGraphFactoryService>(), Mock.Of<TextBufferProjectService>(), TestWorkspace.Create(), NoLiveShare);
-            var textBuffer = Mock.Of<ITextBuffer>();
-
-            // Act
-            var result = workspaceAccessor.TryGetWorkspaceFromHostProject(textBuffer, out var workspace);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TryGetWorkspaceFromHostProject_HasHostProject_ReturnsTrueWithDefaultWorkspace()
-        {
-            // Arrange
-            var textBuffer = Mock.Of<ITextBuffer>();
-            var projectService = Mock.Of<TextBufferProjectService>(service => service.GetHostProject(textBuffer) == new object());
-            var defaultWorkspace = TestWorkspace.Create();
-            var workspaceAccessor = new DefaultVisualStudioWorkspaceAccessor(Mock.Of<IBufferGraphFactoryService>(), projectService, defaultWorkspace, NoLiveShare);
-
-            // Act
-            var result = workspaceAccessor.TryGetWorkspaceFromHostProject(textBuffer, out var workspace);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(defaultWorkspace, workspace);
-        }
-
-        private class TestWorkspaceAccessor : DefaultVisualStudioWorkspaceAccessor
-        {
-            private readonly bool _canGetWorkspaceFromProjectionBuffer;
-            private readonly bool _canGetWorkspaceFromHostProject;
-
-            internal TestWorkspaceAccessor(bool canGetWorkspaceFromProjectionBuffer, bool canGetWorkspaceFromHostProject) :
-                this(canGetWorkspaceFromProjectionBuffer, canGetWorkspaceFromHostProject, NoLiveShare)
-            {
-            }
-
-            internal TestWorkspaceAccessor(
-                bool canGetWorkspaceFromProjectionBuffer,
-                bool canGetWorkspaceFromHostProject,
-                LiveShareWorkspaceProvider liveShareWorkspaceProvider) :
-                base(
-                    Mock.Of<IBufferGraphFactoryService>(),
-                    Mock.Of<TextBufferProjectService>(),
-                    TestWorkspace.Create(),
-                    liveShareWorkspaceProvider)
-            {
-                _canGetWorkspaceFromProjectionBuffer = canGetWorkspaceFromProjectionBuffer;
-                _canGetWorkspaceFromHostProject = canGetWorkspaceFromHostProject;
-            }
-
-            internal override bool TryGetWorkspaceFromProjectionBuffer(ITextBuffer textBuffer, out Workspace workspace)
-            {
-                if (_canGetWorkspaceFromProjectionBuffer)
-                {
-                    workspace = TestWorkspace.Create();
-                    return true;
-                }
-
-                workspace = null;
-                return false;
-            }
-
-            internal override bool TryGetWorkspaceFromHostProject(ITextBuffer textBuffer, out Workspace workspace)
-            {
-                if (_canGetWorkspaceFromHostProject)
-                {
-                    workspace = TestWorkspace.Create();
-                    return true;
-                }
-
-                workspace = null;
-                return false;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DocumentGenerator/BackgroundDocumentGeneratorTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DocumentGenerator/BackgroundDocumentGeneratorTest.cs
deleted file mode 100644
index fdc6bd3698b8..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DocumentGenerator/BackgroundDocumentGeneratorTest.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Moq;
-using Xunit;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    // These tests are really integration tests. There isn't a good way to unit test this functionality since
-    // the only thing in here is threading.
-    public class BackgroundDocumentGeneratorTest : ForegroundDispatcherTestBase
-    {
-        public BackgroundDocumentGeneratorTest()
-        {
-            Documents = new HostDocument[]
-            {
-                new HostDocument("c:\\Test1\\Index.cshtml", "Index.cshtml"),
-                new HostDocument("c:\\Test1\\Components\\Counter.cshtml", "Components\\Counter.cshtml"),
-            };
-
-            HostProject1 = new HostProject("c:\\Test1\\Test1.csproj", FallbackRazorConfiguration.MVC_1_0);
-            HostProject2 = new HostProject("c:\\Test2\\Test2.csproj", FallbackRazorConfiguration.MVC_1_0);
-
-            Workspace = TestWorkspace.Create();
-
-            var projectId1 = ProjectId.CreateNewId("Test1");
-            var projectId2 = ProjectId.CreateNewId("Test2");
-
-            var solution = Workspace.CurrentSolution
-                .AddProject(ProjectInfo.Create(
-                    projectId1,
-                    VersionStamp.Default,
-                    "Test1",
-                    "Test1",
-                    LanguageNames.CSharp,
-                    "c:\\Test1\\Test1.csproj"))
-                .AddProject(ProjectInfo.Create(
-                    projectId2,
-                    VersionStamp.Default,
-                    "Test2",
-                    "Test2",
-                    LanguageNames.CSharp,
-                    "c:\\Test2\\Test2.csproj")); ;
-
-            WorkspaceProject1 = solution.GetProject(projectId1);
-            WorkspaceProject2 = solution.GetProject(projectId2);
-        }
-
-        private HostDocument[] Documents { get; }
-
-        private HostProject HostProject1 { get; }
-
-        private HostProject HostProject2 { get; }
-
-        private Project WorkspaceProject1 { get; }
-
-        private Project WorkspaceProject2 { get; }
-
-        private Workspace Workspace { get; }
-
-        [ForegroundFact]
-        public async Task Queue_ProcessesNotifications_AndGoesBackToSleep()
-        {
-            // Arrange
-            var projectManager = new TestProjectSnapshotManager(Dispatcher, Workspace);
-            projectManager.HostProjectAdded(HostProject1);
-            projectManager.HostProjectAdded(HostProject2);
-            projectManager.WorkspaceProjectAdded(WorkspaceProject1);
-            projectManager.WorkspaceProjectAdded(WorkspaceProject2);
-            projectManager.DocumentAdded(HostProject1, Documents[0], null);
-            projectManager.DocumentAdded(HostProject1, Documents[1], null);
-
-            var project = projectManager.GetLoadedProject(HostProject1.FilePath);
-
-            var queue = new BackgroundDocumentGenerator(Dispatcher)
-            {
-                Delay = TimeSpan.FromMilliseconds(1),
-                BlockBackgroundWorkStart = new ManualResetEventSlim(initialState: false),
-                NotifyBackgroundWorkStarting = new ManualResetEventSlim(initialState: false),
-                BlockBackgroundWorkCompleting = new ManualResetEventSlim(initialState: false),
-                NotifyBackgroundWorkCompleted = new ManualResetEventSlim(initialState: false),
-            };
-
-            // Act & Assert
-            queue.Enqueue(project, project.GetDocument(Documents[0].FilePath));
-
-            Assert.True(queue.IsScheduledOrRunning, "Queue should be scheduled during Enqueue");
-            Assert.True(queue.HasPendingNotifications, "Queue should have a notification created during Enqueue");
-
-            // Allow the background work to proceed.
-            queue.BlockBackgroundWorkStart.Set();
-            queue.BlockBackgroundWorkCompleting.Set();
-
-            await Task.Run(() => queue.NotifyBackgroundWorkCompleted.Wait(TimeSpan.FromSeconds(3)));
-
-            Assert.False(queue.IsScheduledOrRunning, "Queue should not have restarted");
-            Assert.False(queue.HasPendingNotifications, "Queue should have processed all notifications");
-        }
-
-        [ForegroundFact]
-        public async Task Queue_ProcessesNotifications_AndRestarts()
-        {
-            // Arrange
-            var projectManager = new TestProjectSnapshotManager(Dispatcher, Workspace);
-            projectManager.HostProjectAdded(HostProject1);
-            projectManager.HostProjectAdded(HostProject2);
-            projectManager.WorkspaceProjectAdded(WorkspaceProject1);
-            projectManager.WorkspaceProjectAdded(WorkspaceProject2);
-            projectManager.DocumentAdded(HostProject1, Documents[0], null);
-            projectManager.DocumentAdded(HostProject1, Documents[1], null);
-
-            var project = projectManager.GetLoadedProject(HostProject1.FilePath);
-
-            var queue = new BackgroundDocumentGenerator(Dispatcher)
-            {
-                Delay = TimeSpan.FromMilliseconds(1),
-                BlockBackgroundWorkStart = new ManualResetEventSlim(initialState: false),
-                NotifyBackgroundWorkStarting = new ManualResetEventSlim(initialState: false),
-                NotifyBackgroundCapturedWorkload = new ManualResetEventSlim(initialState: false),
-                BlockBackgroundWorkCompleting = new ManualResetEventSlim(initialState: false),
-                NotifyBackgroundWorkCompleted = new ManualResetEventSlim(initialState: false),
-            };
-
-            // Act & Assert
-            queue.Enqueue(project, project.GetDocument(Documents[0].FilePath));
-
-            Assert.True(queue.IsScheduledOrRunning, "Queue should be scheduled during Enqueue");
-            Assert.True(queue.HasPendingNotifications, "Queue should have a notification created during Enqueue");
-
-            // Allow the background work to start.
-            queue.BlockBackgroundWorkStart.Set();
-
-            await Task.Run(() => queue.NotifyBackgroundWorkStarting.Wait(TimeSpan.FromSeconds(1)));
-
-            Assert.True(queue.IsScheduledOrRunning, "Worker should be processing now");
-
-            await Task.Run(() => queue.NotifyBackgroundCapturedWorkload.Wait(TimeSpan.FromSeconds(1)));
-            Assert.False(queue.HasPendingNotifications, "Worker should have taken all notifications");
-
-            queue.Enqueue(project, project.GetDocument(Documents[1].FilePath));
-            Assert.True(queue.HasPendingNotifications); // Now we should see the worker restart when it finishes.
-
-            // Allow work to complete, which should restart the timer.
-            queue.BlockBackgroundWorkCompleting.Set();
-
-            await Task.Run(() => queue.NotifyBackgroundWorkCompleted.Wait(TimeSpan.FromSeconds(3)));
-            queue.NotifyBackgroundWorkCompleted.Reset();
-
-            // It should start running again right away.
-            Assert.True(queue.IsScheduledOrRunning, "Queue should be scheduled during Enqueue");
-            Assert.True(queue.HasPendingNotifications, "Queue should have a notification created during Enqueue");
-
-            // Allow the background work to proceed.
-            queue.BlockBackgroundWorkStart.Set();
-
-            queue.BlockBackgroundWorkCompleting.Set();
-            await Task.Run(() => queue.NotifyBackgroundWorkCompleted.Wait(TimeSpan.FromSeconds(3)));
-
-            Assert.False(queue.IsScheduledOrRunning, "Queue should not have restarted");
-            Assert.False(queue.HasPendingNotifications, "Queue should have processed all notifications");
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Documents/VisualStudioFileChangeTrackerTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Documents/VisualStudioFileChangeTrackerTest.cs
deleted file mode 100644
index fcef648173ff..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Documents/VisualStudioFileChangeTrackerTest.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Shell.Interop;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    public class VisualStudioFileChangeTrackerTest : ForegroundDispatcherTestBase
-    {
-        private ErrorReporter ErrorReporter { get; } = new DefaultErrorReporter();
-
-        [ForegroundFact]
-        public void StartListening_AdvisesForFileChange()
-        {
-            // Arrange
-            uint cookie;
-            var fileChangeService = new Mock<IVsFileChangeEx>();
-            fileChangeService
-                .Setup(f => f.AdviseFileChange(It.IsAny<string>(), It.IsAny<uint>(), It.IsAny<IVsFileChangeEvents>(), out cookie))
-                .Returns(VSConstants.S_OK)
-                .Verifiable();
-            var tracker = new VisualStudioFileChangeTracker("C:/_ViewImports.cshtml", Dispatcher, ErrorReporter, fileChangeService.Object);
-
-            // Act
-            tracker.StartListening();
-
-            // Assert
-            fileChangeService.Verify();
-        }
-
-        [ForegroundFact]
-        public void StartListening_AlreadyListening_DoesNothing()
-        {
-            // Arrange
-            uint cookie = 100;
-            var callCount = 0;
-            var fileChangeService = new Mock<IVsFileChangeEx>();
-            fileChangeService
-                .Setup(f => f.AdviseFileChange(It.IsAny<string>(), It.IsAny<uint>(), It.IsAny<IVsFileChangeEvents>(), out cookie))
-                .Returns(VSConstants.S_OK)
-                .Callback(() => callCount++);
-            var tracker = new VisualStudioFileChangeTracker("C:/_ViewImports.cshtml", Dispatcher, ErrorReporter, fileChangeService.Object);
-            tracker.StartListening();
-
-            // Act
-            tracker.StartListening();
-
-            // Assert
-            Assert.Equal(1, callCount);
-        }
-
-        [ForegroundFact]
-        public void StopListening_UnadvisesForFileChange()
-        {
-            // Arrange
-            uint cookie = 100;
-            var fileChangeService = new Mock<IVsFileChangeEx>(MockBehavior.Strict);
-            fileChangeService
-                .Setup(f => f.AdviseFileChange(It.IsAny<string>(), It.IsAny<uint>(), It.IsAny<IVsFileChangeEvents>(), out cookie))
-                .Returns(VSConstants.S_OK)
-                .Verifiable();
-            fileChangeService
-                .Setup(f => f.UnadviseFileChange(cookie))
-                .Returns(VSConstants.S_OK)
-                .Verifiable();
-            var tracker = new VisualStudioFileChangeTracker("C:/_ViewImports.cshtml", Dispatcher, ErrorReporter, fileChangeService.Object);
-            tracker.StartListening(); // Start listening for changes.
-
-            // Act
-            tracker.StopListening();
-
-            // Assert
-            fileChangeService.Verify();
-        }
-
-        [ForegroundFact]
-        public void StopListening_NotListening_DoesNothing()
-        {
-            // Arrange
-            uint cookie = VSConstants.VSCOOKIE_NIL;
-            var fileChangeService = new Mock<IVsFileChangeEx>(MockBehavior.Strict);
-            fileChangeService
-                .Setup(f => f.UnadviseFileChange(cookie))
-                .Throws(new InvalidOperationException());
-            var tracker = new VisualStudioFileChangeTracker("C:/_ViewImports.cshtml", Dispatcher, ErrorReporter, fileChangeService.Object);
-
-            // Act & Assert
-            tracker.StopListening();
-        }
-
-        [ForegroundTheory]
-        [InlineData((uint)_VSFILECHANGEFLAGS.VSFILECHG_Size, (int)FileChangeKind.Changed)]
-        [InlineData((uint)_VSFILECHANGEFLAGS.VSFILECHG_Time, (int)FileChangeKind.Changed)]
-        [InlineData((uint)_VSFILECHANGEFLAGS.VSFILECHG_Add, (int)FileChangeKind.Added)]
-        [InlineData((uint)_VSFILECHANGEFLAGS.VSFILECHG_Del, (int)FileChangeKind.Removed)]
-        public void FilesChanged_WithSpecificFlags_InvokesChangedHandler_WithExpectedArguments(uint fileChangeFlag, int expectedKind)
-        {
-            // Arrange
-            var filePath = "C:\\path\\to\\project\\_ViewImports.cshtml";
-            uint cookie;
-            var fileChangeService = new Mock<IVsFileChangeEx>();
-            fileChangeService
-                .Setup(f => f.AdviseFileChange(It.IsAny<string>(), It.IsAny<uint>(), It.IsAny<IVsFileChangeEvents>(), out cookie))
-                .Returns(VSConstants.S_OK);
-            var tracker = new VisualStudioFileChangeTracker(filePath, Dispatcher, ErrorReporter, fileChangeService.Object);
-
-            var called = false;
-            tracker.Changed += (sender, args) =>
-            {
-                called = true;
-                Assert.Same(sender, tracker);
-                Assert.Equal(filePath, args.FilePath);
-                Assert.Equal((FileChangeKind)expectedKind, args.Kind);
-            };
-
-            // Act
-            tracker.FilesChanged(fileCount: 1, filePaths: new[] { filePath }, fileChangeFlags: new[] { fileChangeFlag });
-
-            // Assert
-            Assert.True(called);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
deleted file mode 100644
index b60bfeae3c05..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
+++ /dev/null
@@ -1,47 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
-    <PreserveCompilationContext>true</PreserveCompilationContext>
-
-    <!-- The binding redirects are needed due to a conflict between the test host and Roslyn regarding System.Collections.Immutable -->
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Microsoft.CodeAnalysis.Razor.Workspaces.Test\Shared\**\*.cs">
-      <Link>Shared\%(RecursiveDir)%(FileName)%(Extension)</Link>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\Microsoft.VisualStudio.LanguageServices.Razor.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor\Microsoft.AspNetCore.Razor.csproj" />
-    <ProjectReference Include="..\Microsoft.VisualStudio.Editor.Razor.Test.Common\Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(VSIX_MicrosoftCodeAnalysisCommonPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(VSIX_MicrosoftCodeAnalysisCSharpPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion)" />
-    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
-    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/OOPTagHelperResolverTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/OOPTagHelperResolverTest.cs
deleted file mode 100644
index bf81c4e5a841..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/OOPTagHelperResolverTest.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Editor.Razor;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor
-{
-    public class OOPTagHelperResolverTest
-    {
-        public OOPTagHelperResolverTest()
-        {
-            HostProject_For_2_0 = new HostProject("Test.csproj", FallbackRazorConfiguration.MVC_2_0);
-            HostProject_For_NonSerializableConfiguration = new HostProject(
-                "Test.csproj",
-                new ProjectSystemRazorConfiguration(RazorLanguageVersion.Version_2_1, "Blazor-0.1", Array.Empty<RazorExtension>()));
-
-            CustomFactories = new Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>[]
-            {
-                new Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>(
-                    () => new LegacyProjectEngineFactory_2_0(),
-                    typeof(LegacyProjectEngineFactory_2_0).GetCustomAttribute<ExportCustomProjectEngineFactoryAttribute>()),
-
-                // We don't really use this factory, we just use it to ensure that the call is going to go out of process.
-                new Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>(
-                    () => new LegacyProjectEngineFactory_2_1(),
-                    new ExportCustomProjectEngineFactoryAttribute("Blazor-0.1") { SupportsSerialization = false, }),
-            };
-
-            FallbackFactory = new FallbackProjectEngineFactory();
-
-            Workspace = new AdhocWorkspace();
-
-            var info = ProjectInfo.Create(ProjectId.CreateNewId("Test"), VersionStamp.Default, "Test", "Test", LanguageNames.CSharp, filePath: "Test.csproj");
-            WorkspaceProject = Workspace.CurrentSolution.AddProject(info).GetProject(info.Id);
-
-            ErrorReporter = new DefaultErrorReporter();
-            ProjectManager = new TestProjectSnapshotManager(Workspace);
-            EngineFactory = new DefaultProjectSnapshotProjectEngineFactory(FallbackFactory, CustomFactories);
-        }
-
-        private ErrorReporter ErrorReporter { get; }
-
-        private ProjectSnapshotProjectEngineFactory EngineFactory { get; }
-
-        private Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>[] CustomFactories { get; }
-
-        private IFallbackProjectEngineFactory FallbackFactory { get; }
-
-        private HostProject HostProject_For_2_0 { get; }
-
-        private HostProject HostProject_For_NonSerializableConfiguration { get; }
-
-        private ProjectSnapshotManagerBase ProjectManager { get; }
-
-        private Project WorkspaceProject { get; }
-
-        private Workspace Workspace { get; }
-
-        [Fact]
-        public async Task GetTagHelpersAsync_WithNonInitializedProject_Noops()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject_For_2_0);
-
-            var project = ProjectManager.GetLoadedProject("Test.csproj");
-
-            var resolver = new TestTagHelperResolver(EngineFactory, ErrorReporter, Workspace);
-
-            var result = await resolver.GetTagHelpersAsync(project);
-
-            // Assert
-            Assert.Same(TagHelperResolutionResult.Empty, result);
-        }
-
-        [Fact]
-        public async Task GetTagHelpersAsync_WithSerializableCustomFactory_GoesOutOfProcess()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject_For_2_0);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-
-            var project = ProjectManager.GetLoadedProject("Test.csproj");
-
-            var resolver = new TestTagHelperResolver(EngineFactory, ErrorReporter, Workspace)
-            {
-                OnResolveOutOfProcess = (f, p) =>
-                {
-                    Assert.Same(CustomFactories[0].Value, f);
-                    Assert.Same(project, p);
-
-                    return Task.FromResult(TagHelperResolutionResult.Empty);
-                },
-            };
-
-            var result = await resolver.GetTagHelpersAsync(project);
-
-            // Assert
-            Assert.Same(TagHelperResolutionResult.Empty, result);
-        }
-
-        [Fact]
-        public async Task GetTagHelpersAsync_WithNonSerializableCustomFactory_StaysInProcess()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject_For_NonSerializableConfiguration);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-
-            var project = ProjectManager.GetLoadedProject("Test.csproj");
-
-            var resolver = new TestTagHelperResolver(EngineFactory, ErrorReporter, Workspace)
-            {
-                OnResolveInProcess = (p) =>
-                {
-                    Assert.Same(project, p);
-
-                    return Task.FromResult(TagHelperResolutionResult.Empty);
-                },
-            };
-
-            var result = await resolver.GetTagHelpersAsync(project);
-
-            // Assert
-            Assert.Same(TagHelperResolutionResult.Empty, result);
-
-        }
-
-        private class TestTagHelperResolver : OOPTagHelperResolver
-        {
-            public TestTagHelperResolver(ProjectSnapshotProjectEngineFactory factory, ErrorReporter errorReporter, Workspace workspace) 
-                : base(factory, errorReporter, workspace)
-            {
-            }
-
-            public Func<IProjectEngineFactory, ProjectSnapshot, Task<TagHelperResolutionResult>> OnResolveOutOfProcess { get; set; }
-
-            public Func<ProjectSnapshot, Task<TagHelperResolutionResult>> OnResolveInProcess { get; set; }
-
-            protected override Task<TagHelperResolutionResult> ResolveTagHelpersOutOfProcessAsync(IProjectEngineFactory factory, ProjectSnapshot project)
-            {
-                Assert.NotNull(OnResolveOutOfProcess);
-                return OnResolveOutOfProcess(factory, project);
-            }
-
-            protected override Task<TagHelperResolutionResult> ResolveTagHelpersInProcessAsync(ProjectSnapshot project)
-            {
-                Assert.NotNull(OnResolveInProcess);
-                return OnResolveInProcess(project);
-            }
-        }
-        private class TestProjectSnapshotManager : DefaultProjectSnapshotManager
-        {
-            public TestProjectSnapshotManager(Workspace workspace)
-                : base(
-                      Mock.Of<ForegroundDispatcher>(),
-                      Mock.Of<ErrorReporter>(),
-                      Enumerable.Empty<ProjectSnapshotChangeTrigger>(),
-                      workspace)
-            {
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/DefaultProjectSnapshotManagerTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/DefaultProjectSnapshotManagerTest.cs
deleted file mode 100644
index c69fc87f9177..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/DefaultProjectSnapshotManagerTest.cs
+++ /dev/null
@@ -1,971 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Text;
-using Moq;
-using Xunit;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    public class DefaultProjectSnapshotManagerTest : ForegroundDispatcherTestBase
-    {
-        public DefaultProjectSnapshotManagerTest()
-        {
-            TagHelperResolver = new TestTagHelperResolver();
-
-            HostServices = TestServices.Create(
-                new IWorkspaceService[]
-                {
-                    new TestProjectSnapshotProjectEngineFactory(),
-                },
-                new ILanguageService[]
-                {
-                    TagHelperResolver,
-                });
-
-            Documents = new HostDocument[]
-            {
-                new HostDocument("c:\\MyProject\\File.cshtml", "File.cshtml"),
-                new HostDocument("c:\\MyProject\\Index.cshtml", "Index.cshtml"),
-
-                // linked file
-                new HostDocument("c:\\SomeOtherProject\\Index.cshtml", "Pages\\Index.cshtml"),
-            };
-
-            HostProject = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_2_0);
-            HostProjectWithConfigurationChange = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_1_0);
-
-            Workspace = TestWorkspace.Create(HostServices);
-            ProjectManager = new TestProjectSnapshotManager(Dispatcher, Enumerable.Empty<ProjectSnapshotChangeTrigger>(), Workspace);
-
-            var projectId = ProjectId.CreateNewId("Test");
-            var solution = Workspace.CurrentSolution.AddProject(ProjectInfo.Create(
-                projectId,
-                VersionStamp.Default,
-                "Test",
-                "Test",
-                LanguageNames.CSharp,
-                "c:\\MyProject\\Test.csproj"));
-            WorkspaceProject = solution.GetProject(projectId);
-
-            var vbProjectId = ProjectId.CreateNewId("VB");
-            solution = solution.AddProject(ProjectInfo.Create(
-                vbProjectId,
-                VersionStamp.Default,
-                "VB",
-                "VB",
-                LanguageNames.VisualBasic,
-                "VB.vbproj"));
-            VBWorkspaceProject = solution.GetProject(vbProjectId);
-
-            var projectWithoutFilePathId = ProjectId.CreateNewId("NoFile");
-            solution = solution.AddProject(ProjectInfo.Create(
-                projectWithoutFilePathId,
-                VersionStamp.Default,
-                "NoFile",
-                "NoFile",
-                LanguageNames.CSharp));
-            WorkspaceProjectWithoutFilePath = solution.GetProject(projectWithoutFilePathId);
-
-            // Approximates a project with multi-targeting
-            var projectIdWithDifferentTfm = ProjectId.CreateNewId("TestWithDifferentTfm");
-            solution = Workspace.CurrentSolution.AddProject(ProjectInfo.Create(
-                projectIdWithDifferentTfm,
-                VersionStamp.Default,
-                "Test (Different TFM)",
-                "Test",
-                LanguageNames.CSharp,
-                "c:\\MyProject\\Test.csproj"));
-            WorkspaceProjectWithDifferentTfm = solution.GetProject(projectIdWithDifferentTfm);
-
-            SomeTagHelpers = TagHelperResolver.TagHelpers;
-            SomeTagHelpers.Add(TagHelperDescriptorBuilder.Create("Test1", "TestAssembly").Build());
-
-            SourceText = SourceText.From("Hello world");
-        }
-
-        private HostDocument[] Documents { get; }
-
-        private HostProject HostProject { get; }
-
-        private HostProject HostProjectWithConfigurationChange { get; }
-
-        private Project WorkspaceProject { get; }
-
-        private Project WorkspaceProjectWithDifferentTfm { get; }
-
-        private Project WorkspaceProjectWithoutFilePath { get; }
-
-        private Project VBWorkspaceProject { get; }
-
-        private TestTagHelperResolver TagHelperResolver { get; }
-
-        private TestProjectSnapshotManager ProjectManager { get; }
-
-        private HostServices HostServices { get; }
-
-        private Workspace Workspace { get; }
-
-        private SourceText SourceText { get; }
-
-        private IList<TagHelperDescriptor> SomeTagHelpers { get; }
-
-        [ForegroundFact]
-        public void DocumentAdded_AddsDocument()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            Assert.Collection(snapshot.DocumentFilePaths, d => Assert.Equal(Documents[0].FilePath, d));
-
-            Assert.Equal(ProjectChangeKind.DocumentAdded, ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void DocumentAdded_IgnoresDuplicate()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            Assert.Collection(snapshot.DocumentFilePaths, d => Assert.Equal(Documents[0].FilePath, d));
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void DocumentAdded_IgnoresUnknownProject()
-        {
-            // Arrange
-
-            // Act
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            Assert.Null(snapshot);
-        }
-
-        [ForegroundFact]
-        public async Task DocumentAdded_NullLoader_HasEmptyText()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            var document = snapshot.GetDocument(snapshot.DocumentFilePaths.Single());
-
-            var text = await document.GetTextAsync();
-            Assert.Equal(0, text.Length);
-        }
-
-        [ForegroundFact]
-        public async Task DocumentAdded_WithLoader_LoadesText()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            var expected = SourceText.From("Hello");
-
-            // Act
-            ProjectManager.DocumentAdded(HostProject, Documents[0], TextLoader.From(TextAndVersion.Create(expected,VersionStamp.Default)));
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            var document = snapshot.GetDocument(snapshot.DocumentFilePaths.Single());
-
-            var actual = await document.GetTextAsync();
-            Assert.Same(expected, actual);
-        }
-
-        [ForegroundFact]
-        public async Task DocumentAdded_CachesTagHelpers()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-
-            // Adding some computed state
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            await snapshot.GetTagHelpersAsync();
-
-            // Act
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-
-            // Assert
-            snapshot = ProjectManager.GetSnapshot(HostProject);
-            Assert.True(snapshot.TryGetTagHelpers(out var _));
-        }
-
-        [ForegroundFact]
-        public void DocumentAdded_CachesProjectEngine()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.Reset();
-
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            var projectEngine = snapshot.GetProjectEngine();
-
-            // Act
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-
-            // Assert
-            snapshot = ProjectManager.GetSnapshot(HostProject);
-            Assert.Same(projectEngine, snapshot.GetProjectEngine());
-        }
-
-        [ForegroundFact]
-        public void DocumentRemoved_RemovesDocument()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-            ProjectManager.DocumentAdded(HostProject, Documents[1], null);
-            ProjectManager.DocumentAdded(HostProject, Documents[2], null);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.DocumentRemoved(HostProject, Documents[1]);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            Assert.Collection(
-                snapshot.DocumentFilePaths, 
-                d => Assert.Equal(Documents[0].FilePath, d),
-                d => Assert.Equal(Documents[2].FilePath, d));
-
-            Assert.Equal(ProjectChangeKind.DocumentRemoved, ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void DocumentRemoved_IgnoresNotFoundDocument()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.DocumentRemoved(HostProject, Documents[0]);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            Assert.Empty(snapshot.DocumentFilePaths);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void DocumentRemoved_IgnoresUnknownProject()
-        {
-            // Arrange
-
-            // Act
-            ProjectManager.DocumentRemoved(HostProject, Documents[0]);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            Assert.Null(snapshot);
-        }
-
-        [ForegroundFact]
-        public async Task DocumentRemoved_CachesTagHelpers()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-            ProjectManager.DocumentAdded(HostProject, Documents[1], null);
-            ProjectManager.DocumentAdded(HostProject, Documents[2], null);
-            ProjectManager.Reset();
-
-            // Adding some computed state
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            await snapshot.GetTagHelpersAsync();
-
-            // Act
-            ProjectManager.DocumentRemoved(HostProject, Documents[1]);
-
-            // Assert
-            snapshot = ProjectManager.GetSnapshot(HostProject);
-            Assert.True(snapshot.TryGetTagHelpers(out var _));
-        }
-
-        [ForegroundFact]
-        public void DocumentRemoved_CachesProjectEngine()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-            ProjectManager.DocumentAdded(HostProject, Documents[1], null);
-            ProjectManager.DocumentAdded(HostProject, Documents[2], null);
-            ProjectManager.Reset();
-
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            var projectEngine = snapshot.GetProjectEngine();
-
-            // Act
-            ProjectManager.DocumentRemoved(HostProject, Documents[1]);
-
-            // Assert
-            snapshot = ProjectManager.GetSnapshot(HostProject);
-            Assert.Same(projectEngine, snapshot.GetProjectEngine());
-        }
-
-        [ForegroundFact]
-        public async Task DocumentOpened_UpdatesDocument()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.DocumentOpened(HostProject.FilePath, Documents[0].FilePath, SourceText);
-
-            // Assert
-            Assert.Equal(ProjectChangeKind.DocumentChanged, ProjectManager.ListenersNotifiedOf);
-
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            var text = await snapshot.GetDocument(Documents[0].FilePath).GetTextAsync();
-            Assert.Same(SourceText, text);
-
-            Assert.True(ProjectManager.IsDocumentOpen(Documents[0].FilePath));
-        }
-
-        [ForegroundFact]
-        public async Task DocumentClosed_UpdatesDocument()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-            ProjectManager.DocumentOpened(HostProject.FilePath, Documents[0].FilePath, SourceText);
-            ProjectManager.Reset();
-
-            var expected = SourceText.From("Hi");
-            var textAndVersion = TextAndVersion.Create(expected, VersionStamp.Create());
-
-            Assert.True(ProjectManager.IsDocumentOpen(Documents[0].FilePath));
-
-            // Act
-            ProjectManager.DocumentClosed(HostProject.FilePath, Documents[0].FilePath, TextLoader.From(textAndVersion));
-
-            // Assert
-            Assert.Equal(ProjectChangeKind.DocumentChanged, ProjectManager.ListenersNotifiedOf);
-
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            var text = await snapshot.GetDocument(Documents[0].FilePath).GetTextAsync();
-            Assert.Same(expected, text);
-            Assert.False(ProjectManager.IsDocumentOpen(Documents[0].FilePath));
-        }
-       
-
-        [ForegroundFact]
-        public async Task DocumentClosed_AcceptsChange()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-            ProjectManager.Reset();
-
-            var expected = SourceText.From("Hi");
-            var textAndVersion = TextAndVersion.Create(expected, VersionStamp.Create());
-
-            // Act
-            ProjectManager.DocumentClosed(HostProject.FilePath, Documents[0].FilePath, TextLoader.From(textAndVersion));
-
-            // Assert
-            Assert.Equal(ProjectChangeKind.DocumentChanged, ProjectManager.ListenersNotifiedOf);
-
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            var text = await snapshot.GetDocument(Documents[0].FilePath).GetTextAsync();
-            Assert.Same(expected, text);
-        }
-
-        [ForegroundFact]
-        public async Task DocumentChanged_Snapshot_UpdatesDocument()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-            ProjectManager.DocumentOpened(HostProject.FilePath, Documents[0].FilePath, SourceText);
-            ProjectManager.Reset();
-
-            var expected = SourceText.From("Hi");
-
-            // Act
-            ProjectManager.DocumentChanged(HostProject.FilePath, Documents[0].FilePath, expected);
-
-            // Assert
-            Assert.Equal(ProjectChangeKind.DocumentChanged, ProjectManager.ListenersNotifiedOf);
-
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            var text = await snapshot.GetDocument(Documents[0].FilePath).GetTextAsync();
-            Assert.Same(expected, text);
-        }
-
-        [ForegroundFact]
-        public async Task DocumentChanged_Loader_UpdatesDocument()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.DocumentAdded(HostProject, Documents[0], null);
-            ProjectManager.DocumentOpened(HostProject.FilePath, Documents[0].FilePath, SourceText);
-            ProjectManager.Reset();
-
-            var expected = SourceText.From("Hi");
-            var textAndVersion = TextAndVersion.Create(expected, VersionStamp.Create());
-
-            // Act
-            ProjectManager.DocumentChanged(HostProject.FilePath, Documents[0].FilePath, TextLoader.From(textAndVersion));
-
-            // Assert
-            Assert.Equal(ProjectChangeKind.DocumentChanged, ProjectManager.ListenersNotifiedOf);
-
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            var text = await snapshot.GetDocument(Documents[0].FilePath).GetTextAsync();
-            Assert.Same(expected, text);
-        }
-
-        [ForegroundFact]
-        public void HostProjectAdded_WithoutWorkspaceProject_NotifiesListeners()
-        {
-            // Arrange
-
-            // Act
-            ProjectManager.HostProjectAdded(HostProject);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            Assert.False(snapshot.IsInitialized);
-
-            Assert.Equal(ProjectChangeKind.ProjectAdded, ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void HostProjectAdded_FindsWorkspaceProject_NotifiesListeners()
-        {
-            // Arrange
-            Assert.True(Workspace.TryApplyChanges(WorkspaceProject.Solution));
-
-            // Act
-            ProjectManager.HostProjectAdded(HostProject);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            Assert.True(snapshot.IsInitialized);
-
-            Assert.Equal(ProjectChangeKind.ProjectAdded, ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void HostProjectChanged_ConfigurationChange_WithoutWorkspaceProject_NotifiesListeners()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.HostProjectChanged(HostProjectWithConfigurationChange);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(HostProjectWithConfigurationChange);
-            Assert.False(snapshot.IsInitialized);
-
-            Assert.Equal(ProjectChangeKind.ProjectChanged, ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void HostProjectChanged_ConfigurationChange_WithWorkspaceProject_NotifiesListeners()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.HostProjectChanged(HostProjectWithConfigurationChange);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(HostProjectWithConfigurationChange);
-            Assert.True(snapshot.IsInitialized);
-
-            Assert.Equal(ProjectChangeKind.ProjectChanged, ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void HostProjectChanged_ConfigurationChange_DoesNotCacheProjectEngine()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            var projectEngine = snapshot.GetProjectEngine();
-
-            // Act
-            ProjectManager.HostProjectChanged(HostProjectWithConfigurationChange);
-
-            // Assert
-            snapshot = ProjectManager.GetSnapshot(HostProjectWithConfigurationChange);
-            Assert.NotSame(projectEngine, snapshot.GetProjectEngine());
-        }
-
-        [ForegroundFact]
-        public async Task HostProjectChanged_ConfigurationChange_DoesNotCacheComputedState()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-            ProjectManager.Reset();
-
-            // Adding some computed state
-            await snapshot.GetTagHelpersAsync();
-
-            // Act
-            ProjectManager.HostProjectChanged(HostProjectWithConfigurationChange);
-
-            // Assert
-            snapshot = ProjectManager.GetSnapshot(HostProjectWithConfigurationChange);
-            Assert.False(snapshot.TryGetTagHelpers(out var _));
-        }
-
-        [ForegroundFact]
-        public void HostProjectChanged_IgnoresUnknownProject()
-        {
-            // Arrange
-
-            // Act
-            ProjectManager.HostProjectChanged(HostProject);
-
-            // Assert
-            Assert.Empty(ProjectManager.Projects);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void HostProjectRemoved_RemovesProject_NotifiesListeners()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.HostProjectRemoved(HostProject);
-
-            // Assert
-            Assert.Empty(ProjectManager.Projects);
-
-            Assert.Equal(ProjectChangeKind.ProjectRemoved, ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectAdded_WithoutHostProject_IgnoresWorkspaceProject()
-        {
-            // Arrange
-
-            // Act
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-
-            // Assert
-            Assert.Empty(ProjectManager.Projects);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectAdded_IgnoresNonCSharpProject()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.WorkspaceProjectAdded(VBWorkspaceProject);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.False(snapshot.IsInitialized);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectAdded_IgnoresSecondProjectWithSameFilePath()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProjectWithDifferentTfm);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.Same(WorkspaceProject, snapshot.WorkspaceProject);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectAdded_IgnoresProjectWithoutFilePath()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProjectWithoutFilePath);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.False(snapshot.IsInitialized);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectAdded_WithHostProject_NotifiesListenters()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.True(snapshot.IsInitialized);
-
-            Assert.Equal(ProjectChangeKind.ProjectChanged, ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectChanged_WithHostProject_NotifiesListenters()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.WorkspaceProjectChanged(WorkspaceProject.WithAssemblyName("Test1"));
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.True(snapshot.IsInitialized);
-
-            Assert.Equal(ProjectChangeKind.ProjectChanged, ProjectManager.ListenersNotifiedOf);
-        }
-
-        // We always update the snapshot when someone calls WorkspaceProjectChanged. This is how we deal
-        // with changes to source code, which wouldn't result in a new project.
-        [ForegroundFact]
-        public void WorkspaceProjectChanged_WithHostProject_NotifiesListeners()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.WorkspaceProjectChanged(WorkspaceProject);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.True(snapshot.IsInitialized);
-
-            Assert.Equal(ProjectChangeKind.ProjectChanged, ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectChanged_WithHostProject_CanNoOpForSecondProject()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.WorkspaceProjectChanged(WorkspaceProjectWithDifferentTfm);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.True(snapshot.IsInitialized);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectChanged_WithoutHostProject_IgnoresWorkspaceProject()
-        {
-            // Arrange
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            var project = WorkspaceProject.WithAssemblyName("Test1"); // Simulate a project change
-
-            // Act
-            ProjectManager.WorkspaceProjectChanged(project);
-
-            // Assert
-            Assert.Empty(ProjectManager.Projects);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectChanged_IgnoresNonCSharpProject()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(VBWorkspaceProject);
-            ProjectManager.Reset();
-
-            var project = VBWorkspaceProject.WithAssemblyName("Test1"); // Simulate a project change
-
-            // Act
-            ProjectManager.WorkspaceProjectChanged(project);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.False(snapshot.IsInitialized);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectChanged_IgnoresProjectWithoutFilePath()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProjectWithoutFilePath);
-            ProjectManager.Reset();
-
-            var project = WorkspaceProjectWithoutFilePath.WithAssemblyName("Test1"); // Simulate a project change
-
-            // Act
-            ProjectManager.WorkspaceProjectChanged(project);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.False(snapshot.IsInitialized);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectChanged_IgnoresSecondProjectWithSameFilePath()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.WorkspaceProjectChanged(WorkspaceProjectWithDifferentTfm);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.Same(WorkspaceProject, snapshot.WorkspaceProject);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public async Task WorkspaceProjectRemoved_DoesNotRemoveProject_RemovesTagHelpers()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-
-            // Adding some computed state
-            await snapshot.GetTagHelpersAsync();
-
-            // Act
-            ProjectManager.WorkspaceProjectRemoved(WorkspaceProject);
-
-            // Assert
-            snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.False(snapshot.IsInitialized);
-            Assert.False(snapshot.TryGetTagHelpers(out var _));
-
-            Assert.Equal(ProjectChangeKind.ProjectChanged, ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public async Task WorkspaceProjectRemoved_FallsBackToSecondProject()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            var snapshot = ProjectManager.GetSnapshot(HostProject);
-
-            // Adding some computed state
-            await snapshot.GetTagHelpersAsync();
-
-            // Sets up a solution where the which has WorkspaceProjectWithDifferentTfm but not WorkspaceProject
-            // This will enable us to fall back and find the WorkspaceProjectWithDifferentTfm 
-            Assert.True(Workspace.TryApplyChanges(WorkspaceProjectWithDifferentTfm.Solution));
-
-            // Act
-            ProjectManager.WorkspaceProjectRemoved(WorkspaceProject);
-
-            // Assert
-            snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.True(snapshot.IsInitialized);
-            Assert.Equal(WorkspaceProjectWithDifferentTfm.Id, snapshot.WorkspaceProject.Id);
-            Assert.False(snapshot.TryGetTagHelpers(out var _));
-
-            Assert.Equal(ProjectChangeKind.ProjectChanged, ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectRemoved_IgnoresSecondProjectWithSameFilePath()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.WorkspaceProjectRemoved(WorkspaceProjectWithDifferentTfm);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.Same(WorkspaceProject, snapshot.WorkspaceProject);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectRemoved_IgnoresNonCSharpProject()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(VBWorkspaceProject);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.WorkspaceProjectRemoved(VBWorkspaceProject);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.False(snapshot.IsInitialized);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectRemoved_IgnoresProjectWithoutFilePath()
-        {
-            // Arrange
-            ProjectManager.HostProjectAdded(HostProject);
-            ProjectManager.WorkspaceProjectAdded(WorkspaceProjectWithoutFilePath);
-            ProjectManager.Reset();
-
-            // Act
-            ProjectManager.WorkspaceProjectRemoved(WorkspaceProjectWithoutFilePath);
-
-            // Assert
-            var snapshot = ProjectManager.GetSnapshot(WorkspaceProject);
-            Assert.False(snapshot.IsInitialized);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        [ForegroundFact]
-        public void WorkspaceProjectRemoved_IgnoresUnknownProject()
-        {
-            // Arrange
-
-            // Act
-            ProjectManager.WorkspaceProjectRemoved(WorkspaceProject);
-
-            // Assert
-            Assert.Empty(ProjectManager.Projects);
-
-            Assert.Null(ProjectManager.ListenersNotifiedOf);
-        }
-
-        private class TestProjectSnapshotManager : DefaultProjectSnapshotManager
-        {
-            public TestProjectSnapshotManager(ForegroundDispatcher dispatcher, IEnumerable<ProjectSnapshotChangeTrigger> triggers, Workspace workspace)
-                : base(dispatcher, Mock.Of<ErrorReporter>(), triggers, workspace)
-            {
-            }
-
-            public ProjectChangeKind? ListenersNotifiedOf { get; private set; }
-
-            public DefaultProjectSnapshot GetSnapshot(HostProject hostProject)
-            {
-                return Projects.Cast<DefaultProjectSnapshot>().FirstOrDefault(s => s.FilePath == hostProject.FilePath);
-            }
-
-            public DefaultProjectSnapshot GetSnapshot(Project workspaceProject)
-            {
-                return Projects.Cast<DefaultProjectSnapshot>().FirstOrDefault(s => s.FilePath == workspaceProject.FilePath);
-            }
-
-            public void Reset()
-            {
-                ListenersNotifiedOf = null;
-            }
-
-            protected override void NotifyListeners(ProjectChangeEventArgs e)
-            {
-                ListenersNotifiedOf = e.Kind;
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/DefaultRazorProjectHostTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/DefaultRazorProjectHostTest.cs
deleted file mode 100644
index ce7de26d3937..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/DefaultRazorProjectHostTest.cs
+++ /dev/null
@@ -1,1057 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.VisualStudio.ProjectSystem;
-using Microsoft.VisualStudio.ProjectSystem.Properties;
-using Moq;
-using Xunit;
-using ItemCollection = Microsoft.VisualStudio.ProjectSystem.ItemCollection;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    public class DefaultRazorProjectHostTest : ForegroundDispatcherTestBase
-    {
-        public DefaultRazorProjectHostTest()
-        {
-            Workspace = new AdhocWorkspace();
-            ProjectManager = new TestProjectSnapshotManager(Dispatcher, Workspace);
-
-            ConfigurationItems = new ItemCollection(Rules.RazorConfiguration.SchemaName);
-            ExtensionItems = new ItemCollection(Rules.RazorExtension.SchemaName);
-            DocumentItems = new ItemCollection(Rules.RazorGenerateWithTargetPath.SchemaName);
-            RazorGeneralProperties = new PropertyCollection(Rules.RazorGeneral.SchemaName);
-        }
-
-        private ItemCollection ConfigurationItems { get; }
-
-        private ItemCollection ExtensionItems { get; }
-
-        private ItemCollection DocumentItems { get; }
-
-        private PropertyCollection RazorGeneralProperties { get; }
-
-        private TestProjectSnapshotManager ProjectManager { get; }
-
-        private Workspace Workspace { get; }
-
-        [Fact]
-        public void TryGetDefaultConfiguration_FailsIfNoRule()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>().ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetDefaultConfiguration(projectState, out var defaultConfiguration);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(defaultConfiguration);
-        }
-
-        [Fact]
-        public void TryGetDefaultConfiguration_FailsIfNoConfiguration()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorGeneral.SchemaName] = TestProjectRuleSnapshot.CreateProperties(Rules.RazorGeneral.SchemaName, new Dictionary<string, string>())
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetDefaultConfiguration(projectState, out var defaultConfiguration);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(defaultConfiguration);
-        }
-
-        [Fact]
-        public void TryGetDefaultConfiguration_FailsIfEmptyConfiguration()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorGeneral.SchemaName] = TestProjectRuleSnapshot.CreateProperties(
-                    Rules.RazorGeneral.SchemaName, 
-                    new Dictionary<string, string>()
-                    {
-                        [Rules.RazorGeneral.RazorDefaultConfigurationProperty] = string.Empty
-                    })
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetDefaultConfiguration(projectState, out var defaultConfiguration);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(defaultConfiguration);
-        }
-
-        [Fact]
-        public void TryGetDefaultConfiguration_SucceedsWithValidConfiguration()
-        {
-            // Arrange
-            var expectedConfiguration = "Razor-13.37";
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorGeneral.SchemaName] = TestProjectRuleSnapshot.CreateProperties(
-                    Rules.RazorGeneral.SchemaName, 
-                    new Dictionary<string, string>()
-                    {
-                        [Rules.RazorGeneral.RazorDefaultConfigurationProperty] = expectedConfiguration
-                    })
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetDefaultConfiguration(projectState, out var defaultConfiguration);
-
-            // Assert
-            Assert.True(result);
-            Assert.Equal(expectedConfiguration, defaultConfiguration);
-        }
-
-        [Fact]
-        public void TryGetLanguageVersion_FailsIfNoRule()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>().ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetLanguageVersion(projectState, out var languageVersion);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(languageVersion);
-        }
-
-        [Fact]
-        public void TryGetLanguageVersion_FailsIfNoLanguageVersion()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorGeneral.SchemaName] = TestProjectRuleSnapshot.CreateProperties(Rules.RazorGeneral.SchemaName, new Dictionary<string, string>())
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetLanguageVersion(projectState, out var languageVersion);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(languageVersion);
-        }
-
-        [Fact]
-        public void TryGetLanguageVersion_FailsIfEmptyLanguageVersion()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorGeneral.SchemaName] = TestProjectRuleSnapshot.CreateProperties(
-                    Rules.RazorGeneral.SchemaName, 
-                    new Dictionary<string, string>()
-                    {
-                        [Rules.RazorGeneral.RazorLangVersionProperty] = string.Empty
-                    })
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetLanguageVersion(projectState, out var languageVersion);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(languageVersion);
-        }
-
-        [Fact]
-        public void TryGetLanguageVersion_SucceedsWithValidLanguageVersion()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorGeneral.SchemaName] = TestProjectRuleSnapshot.CreateProperties(
-                    Rules.RazorGeneral.SchemaName, 
-                    new Dictionary<string, string>()
-                    {
-                        [Rules.RazorGeneral.RazorLangVersionProperty] = "1.0"
-                    })
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetLanguageVersion(projectState, out var languageVersion);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(RazorLanguageVersion.Version_1_0, languageVersion);
-        }
-
-        [Fact]
-        public void TryGetLanguageVersion_SucceedsWithUnknownLanguageVersion_DefaultsToLatest()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorGeneral.SchemaName] = TestProjectRuleSnapshot.CreateProperties(
-                    Rules.RazorGeneral.SchemaName, 
-                    new Dictionary<string, string>()
-                    {
-                        [Rules.RazorGeneral.RazorLangVersionProperty] = "13.37"
-                    })
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetLanguageVersion(projectState, out var languageVersion);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(RazorLanguageVersion.Latest, languageVersion);
-        }
-
-        [Fact]
-        public void TryGetConfigurationItem_FailsNoRazorConfigurationRule()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>().ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfigurationItem("Razor-13.37", projectState, out var configurationItem);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TryGetConfigurationItem_FailsNoRazorConfigurationItems()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorConfiguration.SchemaName] = TestProjectRuleSnapshot.CreateItems(
-                    Rules.RazorConfiguration.SchemaName, 
-                    new Dictionary<string, Dictionary<string, string>>())
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfigurationItem("Razor-13.37", projectState, out var configurationItem);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TryGetConfigurationItem_FailsNoMatchingRazorConfigurationItems()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorConfiguration.SchemaName] = TestProjectRuleSnapshot.CreateItems(
-                    Rules.RazorConfiguration.SchemaName, 
-                    new Dictionary<string, Dictionary<string, string>>()
-                    {
-                        ["Razor-10.0"] = new Dictionary<string, string>(),
-                    })
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfigurationItem("Razor-13.37", projectState, out var configurationItem);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact]
-        public void TryGetConfigurationItem_SucceedsForMatchingConfigurationItem()
-        {
-            // Arrange
-            var expectedConfiguration = "Razor-13.37";
-            var expectedConfigurationValue = new Dictionary<string, string>()
-            {
-                [Rules.RazorConfiguration.ExtensionsProperty] = "SomeExtension"
-            };
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorConfiguration.SchemaName] = TestProjectRuleSnapshot.CreateItems(
-                    Rules.RazorConfiguration.SchemaName, 
-                    new Dictionary<string, Dictionary<string, string>>()
-                {
-                    [expectedConfiguration] = expectedConfigurationValue
-                })
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfigurationItem(expectedConfiguration, projectState, out var configurationItem);
-
-            // Assert
-            Assert.True(result);
-            Assert.Equal(expectedConfiguration, configurationItem.Key);
-            Assert.True(Enumerable.SequenceEqual(expectedConfigurationValue, configurationItem.Value));
-        }
-
-        [Fact]
-        public void TryGetConfiguredExtensionNames_FailsIfNoExtensions()
-        {
-            // Arrange
-            var items = new ItemCollection(Rules.RazorConfiguration.SchemaName);
-            items.Item("Test");
-
-            var item = items.ToSnapshot().Items.Single();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetExtensionNames(item, out var configuredExtensionnames);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configuredExtensionnames);
-        }
-
-        [Fact]
-        public void TryGetConfiguredExtensionNames_FailsIfEmptyExtensions()
-        {
-            // Arrange
-            var items = new ItemCollection(Rules.RazorConfiguration.SchemaName);
-            items.Item("Test");
-            items.Property("Test", Rules.RazorConfiguration.ExtensionsProperty, string.Empty);
-
-            var item = items.ToSnapshot().Items.Single();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetExtensionNames(item, out var configuredExtensionNames);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configuredExtensionNames);
-        }
-
-        [Fact]
-        public void TryGetConfiguredExtensionNames_SucceedsIfSingleExtension()
-        {
-            // Arrange
-            var expectedExtensionName = "SomeExtensionName";
-
-            var items = new ItemCollection(Rules.RazorConfiguration.SchemaName);
-            items.Item("Test");
-            items.Property("Test", Rules.RazorConfiguration.ExtensionsProperty, "SomeExtensionName");
-
-            var item = items.ToSnapshot().Items.Single();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetExtensionNames(item, out var configuredExtensionNames);
-
-            // Assert
-            Assert.True(result);
-            var extensionName = Assert.Single(configuredExtensionNames);
-            Assert.Equal(expectedExtensionName, extensionName);
-        }
-
-        [Fact]
-        public void TryGetConfiguredExtensionNames_SucceedsIfMultipleExtensions()
-        {
-            // Arrange
-            var items = new ItemCollection(Rules.RazorConfiguration.SchemaName);
-            items.Item("Test");
-            items.Property("Test", Rules.RazorConfiguration.ExtensionsProperty, "SomeExtensionName;SomeOtherExtensionName");
-
-            var item = items.ToSnapshot().Items.Single();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetExtensionNames(item, out var configuredExtensionNames);
-
-            // Assert
-            Assert.True(result);
-            Assert.Collection(
-                configuredExtensionNames,
-                name => Assert.Equal("SomeExtensionName", name),
-                name => Assert.Equal("SomeOtherExtensionName", name));
-        }
-
-        [Fact]
-        public void TryGetExtensions_NoExtensions()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>().ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetExtensions(new[] { "Extension1", "Extension2" }, projectState, out var extensions);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(extensions);
-        }
-
-        [Fact]
-        public void TryGetExtensions_SucceedsWithUnConfiguredExtensionTypes()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorExtension.PrimaryDataSourceItemType] = TestProjectRuleSnapshot.CreateItems(
-                    Rules.RazorExtension.PrimaryDataSourceItemType,
-                    new Dictionary<string, Dictionary<string, string>>()
-                    {
-                        ["UnconfiguredExtensionName"] = new Dictionary<string, string>()
-                    })
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetExtensions(new[] { "Extension1", "Extension2" }, projectState, out var extensions);
-
-            // Assert
-            Assert.True(result);
-            Assert.Empty(extensions);
-        }
-
-        [Fact]
-        public void TryGetExtensions_SucceedsWithSomeConfiguredExtensions()
-        {
-            // Arrange
-            var expectedExtension1Name = "Extension1";
-            var expectedExtension2Name = "Extension2";
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorExtension.PrimaryDataSourceItemType] = TestProjectRuleSnapshot.CreateItems(
-                    Rules.RazorExtension.PrimaryDataSourceItemType,
-                    new Dictionary<string, Dictionary<string, string>>()
-                    {
-                        ["UnconfiguredExtensionName"] = new Dictionary<string, string>(),
-                        [expectedExtension1Name] = new Dictionary<string, string>(),
-                        [expectedExtension2Name] = new Dictionary<string, string>(),
-                    })
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetExtensions(new[] { expectedExtension1Name, expectedExtension2Name }, projectState, out var extensions);
-
-            // Assert
-            Assert.True(result);
-            Assert.Collection(
-                extensions,
-                extension => Assert.Equal(expectedExtension2Name, extension.ExtensionName),
-                extension => Assert.Equal(expectedExtension1Name, extension.ExtensionName));
-        }
-
-        [Fact]
-        public void TryGetConfiguration_FailsIfNoDefaultConfiguration()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>().ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguration(projectState, out var configuration);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configuration);
-        }
-
-        [Fact]
-        public void TryGetConfiguration_FailsIfNoLanguageVersion()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorGeneral.SchemaName] = TestProjectRuleSnapshot.CreateProperties(
-                    Rules.RazorGeneral.SchemaName,
-                    new Dictionary<string, string>()
-                    {
-                        [Rules.RazorGeneral.RazorDefaultConfigurationProperty] = "13.37"
-                    })
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguration(projectState, out var configuration);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configuration);
-        }
-
-        [Fact]
-        public void TryGetConfiguration_FailsIfNoConfigurationItems()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorGeneral.SchemaName] = TestProjectRuleSnapshot.CreateProperties(
-                    Rules.RazorGeneral.SchemaName,
-                    new Dictionary<string, string>()
-                    {
-                        [Rules.RazorGeneral.RazorDefaultConfigurationProperty] = "13.37",
-                        [Rules.RazorGeneral.RazorLangVersionProperty] = "1.0",
-                    })
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguration(projectState, out var configuration);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configuration);
-        }
-
-        [Fact]
-        public void TryGetConfiguration_FailsIfNoConfiguredExtensionNames()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorGeneral.SchemaName] = TestProjectRuleSnapshot.CreateProperties(
-                    Rules.RazorGeneral.SchemaName,
-                    new Dictionary<string, string>()
-                    {
-                        [Rules.RazorGeneral.RazorDefaultConfigurationProperty] = "13.37",
-                        [Rules.RazorGeneral.RazorLangVersionProperty] = "1.0",
-                    }),
-                [Rules.RazorConfiguration.SchemaName] = TestProjectRuleSnapshot.CreateItems(
-                    Rules.RazorConfiguration.SchemaName,
-                    new Dictionary<string, Dictionary<string, string>>()
-                    {
-                        ["Razor-13.37"] = new Dictionary<string, string>()
-                    })
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguration(projectState, out var configuration);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configuration);
-        }
-
-        [Fact]
-        public void TryGetConfiguration_FailsIfNoExtensions()
-        {
-            // Arrange
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorGeneral.SchemaName] = TestProjectRuleSnapshot.CreateProperties(
-                    Rules.RazorGeneral.SchemaName,
-                    new Dictionary<string, string>()
-                    {
-                        [Rules.RazorGeneral.RazorDefaultConfigurationProperty] = "13.37",
-                        [Rules.RazorGeneral.RazorLangVersionProperty] = "1.0",
-                    }),
-                [Rules.RazorConfiguration.SchemaName] = TestProjectRuleSnapshot.CreateItems(
-                    Rules.RazorConfiguration.SchemaName,
-                    new Dictionary<string, Dictionary<string, string>>()
-                    {
-                        ["SomeExtension"] = new Dictionary<string, string>()
-                        {
-                            ["Extensions"] = "Razor-13.37"
-                        }
-                    })
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguration(projectState, out var configuration);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configuration);
-        }
-
-        // This is more of an integration test but is here to test the overall flow/functionality
-        [Fact]
-        public void TryGetConfiguration_SucceedsWithAllPreRequisites()
-        {
-            // Arrange
-            var expectedLanguageVersion = RazorLanguageVersion.Version_1_0;
-            var expectedConfigurationName = "Razor-Test";
-            var expectedExtension1Name = "Extension1";
-            var expectedExtension2Name = "Extension2";
-            var projectState = new Dictionary<string, IProjectRuleSnapshot>()
-            {
-                [Rules.RazorGeneral.SchemaName] = TestProjectRuleSnapshot.CreateProperties(
-                    Rules.RazorGeneral.SchemaName,
-                    new Dictionary<string, string>()
-                    {
-                        [Rules.RazorGeneral.RazorDefaultConfigurationProperty] = expectedConfigurationName,
-                        [Rules.RazorGeneral.RazorLangVersionProperty] = "1.0",
-                    }),
-                [Rules.RazorConfiguration.SchemaName] = TestProjectRuleSnapshot.CreateItems(
-                    Rules.RazorConfiguration.SchemaName,
-                    new Dictionary<string, Dictionary<string, string>>()
-                    {
-                        ["UnconfiguredRazorConfiguration"] = new Dictionary<string, string>()
-                        {
-                            ["Extensions"] = "Razor-9.0"
-                        },
-                        [expectedConfigurationName] = new Dictionary<string, string>()
-                        {
-                            ["Extensions"] = expectedExtension1Name + ";" + expectedExtension2Name
-                        }
-                    }),
-                [Rules.RazorExtension.PrimaryDataSourceItemType] = TestProjectRuleSnapshot.CreateItems(
-                    Rules.RazorExtension.PrimaryDataSourceItemType,
-                    new Dictionary<string, Dictionary<string, string>>()
-                    {
-                        [expectedExtension1Name] = new Dictionary<string, string>(),
-                        [expectedExtension2Name] = new Dictionary<string, string>(),
-                    })
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguration(projectState, out var configuration);
-
-            // Assert
-            Assert.True(result);
-            Assert.Equal(expectedLanguageVersion, configuration.LanguageVersion);
-            Assert.Equal(expectedConfigurationName, configuration.ConfigurationName);
-            Assert.Collection(
-                configuration.Extensions,
-                extension => Assert.Equal(expectedExtension2Name, extension.ExtensionName),
-                extension => Assert.Equal(expectedExtension1Name, extension.ExtensionName));
-        }
-
-        [ForegroundFact]
-        public async Task DefaultRazorProjectHost_ForegroundThread_CreateAndDispose_Succeeds()
-        {
-            // Arrange
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
-            var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
-
-            // Act & Assert
-            await host.LoadAsync();
-            Assert.Empty(ProjectManager.Projects);
-
-            await host.DisposeAsync();
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task DefaultRazorProjectHost_BackgroundThread_CreateAndDispose_Succeeds()
-        {
-            // Arrange
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
-            var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
-
-            // Act & Assert
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            await Task.Run(async () => await host.DisposeAsync());
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact] // This can happen if the .xaml files aren't included correctly.
-        public async Task DefaultRazorProjectHost_OnProjectChanged_NoRulesDefined()
-        {
-            // Arrange
-            var changes = new TestProjectChangeDescription[]
-            {
-            };
-
-            var services = new TestProjectSystemServices("Test.csproj");
-            var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
-
-            // Act & Assert
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task OnProjectChanged_ReadsProperties_InitializesProject()
-        {
-            // Arrange
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorLangVersionProperty, "2.1");
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorDefaultConfigurationProperty, "MVC-2.1");
-
-            ConfigurationItems.Item("MVC-2.1");
-            ConfigurationItems.Property("MVC-2.1", Rules.RazorConfiguration.ExtensionsProperty, "MVC-2.1;Another-Thing");
-
-            ExtensionItems.Item("MVC-2.1");
-            ExtensionItems.Item("Another-Thing");
-
-            DocumentItems.Item("File.cshtml");
-            DocumentItems.Property("File.cshtml", Rules.RazorGenerateWithTargetPath.TargetPathProperty, "File.cshtml");
-
-            var changes = new TestProjectChangeDescription[]
-            {
-                RazorGeneralProperties.ToChange(),
-                ConfigurationItems.ToChange(),
-                ExtensionItems.ToChange(),
-                DocumentItems.ToChange(),
-            };
-
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
-
-            var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
-
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert
-            var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("c:\\MyProject\\Test.csproj", snapshot.FilePath);
-
-            Assert.Equal(RazorLanguageVersion.Version_2_1, snapshot.Configuration.LanguageVersion);
-            Assert.Equal("MVC-2.1", snapshot.Configuration.ConfigurationName);
-            Assert.Collection(
-                snapshot.Configuration.Extensions,
-                e => Assert.Equal("MVC-2.1", e.ExtensionName),
-                e => Assert.Equal("Another-Thing", e.ExtensionName));
-
-            Assert.Collection(
-                snapshot.DocumentFilePaths.OrderBy(d => d),
-                d =>
-                {
-                    var document = snapshot.GetDocument(d);
-                    Assert.Equal("c:\\MyProject\\File.cshtml", document.FilePath);
-                    Assert.Equal("File.cshtml", document.TargetPath);
-                });
-
-            await Task.Run(async () => await host.DisposeAsync());
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task OnProjectChanged_NoVersionFound_DoesNotIniatializeProject()
-        {
-            // Arrange
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorLangVersionProperty, "");
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorDefaultConfigurationProperty, "");
-
-            ConfigurationItems.Item("TestConfiguration");
-
-            ExtensionItems.Item("TestExtension");
-
-            DocumentItems.Item("File.cshtml");
-
-            var changes = new TestProjectChangeDescription[]
-            {
-                RazorGeneralProperties.ToChange(),
-                ConfigurationItems.ToChange(),
-                ExtensionItems.ToChange(),
-                DocumentItems.ToChange(),
-            };
-
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
-
-            var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
-
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert
-            Assert.Empty(ProjectManager.Projects);
-
-            await Task.Run(async () => await host.DisposeAsync());
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task OnProjectChanged_UpdateProject_Succeeds()
-        {
-            // Arrange
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorLangVersionProperty, "2.1");
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorDefaultConfigurationProperty, "MVC-2.1");
-
-            ConfigurationItems.Item("MVC-2.1");
-            ConfigurationItems.Property("MVC-2.1", Rules.RazorConfiguration.ExtensionsProperty, "MVC-2.1;Another-Thing");
-
-            ExtensionItems.Item("MVC-2.1");
-            ExtensionItems.Item("Another-Thing");
-
-            DocumentItems.Item("File.cshtml");
-            DocumentItems.Property("File.cshtml", Rules.RazorGenerateWithTargetPath.TargetPathProperty, "File.cshtml");
-
-            var changes = new TestProjectChangeDescription[]
-            {
-                RazorGeneralProperties.ToChange(),
-                ConfigurationItems.ToChange(),
-                ExtensionItems.ToChange(),
-                DocumentItems.ToChange(),
-            };
-
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
-
-            var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
-
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act - 1
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert - 1
-            var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("c:\\MyProject\\Test.csproj", snapshot.FilePath);
-
-            Assert.Equal(RazorLanguageVersion.Version_2_1, snapshot.Configuration.LanguageVersion);
-            Assert.Equal("MVC-2.1", snapshot.Configuration.ConfigurationName);
-            Assert.Collection(
-                snapshot.Configuration.Extensions,
-                e => Assert.Equal("MVC-2.1", e.ExtensionName),
-                e => Assert.Equal("Another-Thing", e.ExtensionName));
-
-            Assert.Collection(
-                snapshot.DocumentFilePaths.OrderBy(d => d),
-                d => 
-                {
-                    var document = snapshot.GetDocument(d);
-                    Assert.Equal("c:\\MyProject\\File.cshtml", document.FilePath);
-                    Assert.Equal("File.cshtml", document.TargetPath);
-                });
-
-            // Act - 2
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorLangVersionProperty, "2.0");
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorDefaultConfigurationProperty, "MVC-2.0");
-            ConfigurationItems.RemoveItem("MVC-2.1");
-            ConfigurationItems.Item("MVC-2.0", new Dictionary<string, string>() { { "Extensions", "MVC-2.0;Another-Thing" }, });
-            ExtensionItems.Item("MVC-2.0");
-            DocumentItems.Item("c:\\AnotherProject\\AnotherFile.cshtml", new Dictionary<string, string>()
-            {
-                { Rules.RazorGenerateWithTargetPath.TargetPathProperty, "Pages\\AnotherFile.cshtml" },
-            });
-
-            changes = new TestProjectChangeDescription[]
-            {
-                RazorGeneralProperties.ToChange(changes[0].After),
-                ConfigurationItems.ToChange(changes[1].After),
-                ExtensionItems.ToChange(changes[2].After),
-                DocumentItems.ToChange(changes[3].After),
-            };
-
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert - 2
-            snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("c:\\MyProject\\Test.csproj", snapshot.FilePath);
-
-            Assert.Equal(RazorLanguageVersion.Version_2_0, snapshot.Configuration.LanguageVersion);
-            Assert.Equal("MVC-2.0", snapshot.Configuration.ConfigurationName);
-            Assert.Collection(
-                snapshot.Configuration.Extensions,
-                e => Assert.Equal("Another-Thing", e.ExtensionName),
-                e => Assert.Equal("MVC-2.0", e.ExtensionName));
-
-            Assert.Collection(
-                snapshot.DocumentFilePaths.OrderBy(d => d),
-                d =>
-                {
-                    var document = snapshot.GetDocument(d);
-                    Assert.Equal("c:\\AnotherProject\\AnotherFile.cshtml", document.FilePath);
-                    Assert.Equal("Pages\\AnotherFile.cshtml", document.TargetPath);
-                },
-                d =>
-                {
-                    var document = snapshot.GetDocument(d);
-                    Assert.Equal("c:\\MyProject\\File.cshtml", document.FilePath);
-                    Assert.Equal("File.cshtml", document.TargetPath);
-                });
-
-            await Task.Run(async () => await host.DisposeAsync());
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task OnProjectChanged_VersionRemoved_DeinitializesProject()
-        {
-            // Arrange
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorLangVersionProperty, "2.1");
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorDefaultConfigurationProperty, "MVC-2.1");
-
-            ConfigurationItems.Item("MVC-2.1");
-            ConfigurationItems.Property("MVC-2.1", Rules.RazorConfiguration.ExtensionsProperty, "MVC-2.1;Another-Thing");
-
-            ExtensionItems.Item("MVC-2.1");
-            ExtensionItems.Item("Another-Thing");
-
-            DocumentItems.Item("File.cshtml");
-            DocumentItems.Property("File.cshtml", Rules.RazorGenerateWithTargetPath.TargetPathProperty, "File.cshtml");
-
-            var changes = new TestProjectChangeDescription[]
-            {
-                RazorGeneralProperties.ToChange(),
-                ConfigurationItems.ToChange(),
-                ExtensionItems.ToChange(),
-                DocumentItems.ToChange(),
-            };
-
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
-
-            var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
-
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act - 1
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert - 1
-            var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("c:\\MyProject\\Test.csproj", snapshot.FilePath);
-
-            Assert.Equal(RazorLanguageVersion.Version_2_1, snapshot.Configuration.LanguageVersion);
-            Assert.Equal("MVC-2.1", snapshot.Configuration.ConfigurationName);
-            Assert.Collection(
-                snapshot.Configuration.Extensions,
-                e => Assert.Equal("MVC-2.1", e.ExtensionName),
-                e => Assert.Equal("Another-Thing", e.ExtensionName));
-
-            // Act - 2
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorLangVersionProperty, "");
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorDefaultConfigurationProperty, "");
-
-            changes = new TestProjectChangeDescription[]
-            {
-                RazorGeneralProperties.ToChange(changes[0].After),
-                ConfigurationItems.ToChange(changes[1].After),
-                ExtensionItems.ToChange(changes[2].After),
-                DocumentItems.ToChange(changes[3].After),
-            };
-
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert - 2
-            Assert.Empty(ProjectManager.Projects);
-
-            await Task.Run(async () => await host.DisposeAsync());
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task OnProjectChanged_AfterDispose_IgnoresUpdate()
-        {
-            // Arrange
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorLangVersionProperty, "2.1");
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorDefaultConfigurationProperty, "MVC-2.1");
-
-            ConfigurationItems.Item("MVC-2.1");
-            ConfigurationItems.Property("MVC-2.1", Rules.RazorConfiguration.ExtensionsProperty, "MVC-2.1;Another-Thing");
-
-            ExtensionItems.Item("MVC-2.1");
-            ExtensionItems.Item("Another-Thing");
-
-            DocumentItems.Item("File.cshtml");
-            DocumentItems.Property("File.cshtml", Rules.RazorGenerateWithTargetPath.TargetPathProperty, "File.cshtml");
-
-            var changes = new TestProjectChangeDescription[]
-            {
-                RazorGeneralProperties.ToChange(),
-                ConfigurationItems.ToChange(),
-                ExtensionItems.ToChange(),
-                DocumentItems.ToChange(),
-            };
-
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
-
-            var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
-
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act - 1
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert - 1
-            var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("c:\\MyProject\\Test.csproj", snapshot.FilePath);
-
-            Assert.Equal(RazorLanguageVersion.Version_2_1, snapshot.Configuration.LanguageVersion);
-            Assert.Equal("MVC-2.1", snapshot.Configuration.ConfigurationName);
-            Assert.Collection(
-                snapshot.Configuration.Extensions,
-                e => Assert.Equal("MVC-2.1", e.ExtensionName),
-                e => Assert.Equal("Another-Thing", e.ExtensionName));
-
-            // Act - 2
-            await Task.Run(async () => await host.DisposeAsync());
-
-            // Assert - 2
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act - 3
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorLangVersionProperty, "2.0");
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorDefaultConfigurationProperty, "MVC-2.0");
-            ConfigurationItems.Item("MVC-2.0", new Dictionary<string, string>() { { "Extensions", "MVC-2.0;Another-Thing" }, });
-
-            changes = new TestProjectChangeDescription[]
-            {
-                RazorGeneralProperties.ToChange(changes[0].After),
-                ConfigurationItems.ToChange(changes[1].After),
-                ExtensionItems.ToChange(changes[2].After),
-                DocumentItems.ToChange(changes[3].After),
-            };
-
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert - 3
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task OnProjectRenamed_RemovesHostProject_CopiesConfiguration()
-        {
-            // Arrange
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorLangVersionProperty, "2.1");
-            RazorGeneralProperties.Property(Rules.RazorGeneral.RazorDefaultConfigurationProperty, "MVC-2.1");
-
-            ConfigurationItems.Item("MVC-2.1");
-            ConfigurationItems.Property("MVC-2.1", Rules.RazorConfiguration.ExtensionsProperty, "MVC-2.1;Another-Thing");
-
-            ExtensionItems.Item("MVC-2.1");
-            ExtensionItems.Item("Another-Thing");
-
-            DocumentItems.Item("File.cshtml");
-            DocumentItems.Property("File.cshtml", Rules.RazorGenerateWithTargetPath.TargetPathProperty, "File.cshtml");
-
-            var changes = new TestProjectChangeDescription[]
-            {
-                RazorGeneralProperties.ToChange(),
-                ConfigurationItems.ToChange(),
-                ExtensionItems.ToChange(),
-                DocumentItems.ToChange(),
-            };
-
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
-
-            var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
-
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act - 1
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert - 1
-            var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("c:\\MyProject\\Test.csproj", snapshot.FilePath);
-            Assert.Same("MVC-2.1", snapshot.Configuration.ConfigurationName);
-
-            // Act - 2
-            services.UnconfiguredProject.FullPath = "c:\\AnotherProject\\Test2.csproj";
-            await Task.Run(async () => await host.OnProjectRenamingAsync());
-
-            // Assert - 1
-            snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("c:\\AnotherProject\\Test2.csproj", snapshot.FilePath);
-            Assert.Same("MVC-2.1", snapshot.Configuration.ConfigurationName);
-
-            await Task.Run(async () => await host.DisposeAsync());
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        private class TestProjectSnapshotManager : DefaultProjectSnapshotManager
-        {
-            public TestProjectSnapshotManager(ForegroundDispatcher dispatcher, Workspace workspace) 
-                : base(dispatcher, Mock.Of<ErrorReporter>(), Array.Empty<ProjectSnapshotChangeTrigger>(), workspace)
-            {
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/FallbackRazorProjectHostTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/FallbackRazorProjectHostTest.cs
deleted file mode 100644
index 8cb7174d1b88..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/FallbackRazorProjectHostTest.cs
+++ /dev/null
@@ -1,587 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Threading.Tasks;
-using Microsoft.VisualStudio.ProjectSystem;
-using Moq;
-using Xunit;
-using ItemReference = Microsoft.CodeAnalysis.Razor.ProjectSystem.ManagedProjectSystemSchema.ItemReference;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    public class FallbackRazorProjectHostTest : ForegroundDispatcherTestBase
-    {
-        public FallbackRazorProjectHostTest()
-        {
-            Workspace = new AdhocWorkspace();
-            ProjectManager = new TestProjectSnapshotManager(Dispatcher, Workspace);
-
-            ReferenceItems = new ItemCollection(ManagedProjectSystemSchema.ResolvedCompilationReference.SchemaName);
-            ContentItems = new ItemCollection(ManagedProjectSystemSchema.ContentItem.SchemaName);
-            NoneItems = new ItemCollection(ManagedProjectSystemSchema.NoneItem.SchemaName);
-        }
-
-        private ItemCollection ReferenceItems { get; }
-
-        private TestProjectSnapshotManager ProjectManager { get; }
-
-        private ItemCollection ContentItems { get; }
-
-        private ItemCollection NoneItems { get; }
-
-        private Workspace Workspace { get; }
-
-        [Fact]
-        public void GetChangedAndRemovedDocuments_ReturnsChangedContentAndNoneItems()
-        {
-            // Arrange
-            var afterChangeContentItems = new ItemCollection(ManagedProjectSystemSchema.ContentItem.SchemaName);
-            ContentItems.Item("Index.cshtml", new Dictionary<string, string>()
-            {
-                [ItemReference.LinkPropertyName] = "NewIndex.cshtml",
-                [ItemReference.FullPathPropertyName] = "C:\\From\\Index.cshtml",
-            });
-            var afterChangeNoneItems = new ItemCollection(ManagedProjectSystemSchema.NoneItem.SchemaName);
-            NoneItems.Item("About.cshtml", new Dictionary<string, string>()
-            {
-                [ItemReference.LinkPropertyName] = "NewAbout.cshtml",
-                [ItemReference.FullPathPropertyName] = "C:\\From\\About.cshtml",
-            });
-            var services = new TestProjectSystemServices("C:\\To\\Test.csproj");
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager);
-            var changes = new TestProjectChangeDescription[]
-            {
-                afterChangeContentItems.ToChange(ContentItems.ToSnapshot()),
-                afterChangeNoneItems.ToChange(NoneItems.ToSnapshot()),
-            };
-            var update = services.CreateUpdate(changes).Value;
-
-            // Act
-            var result = host.GetChangedAndRemovedDocuments(update);
-
-            // Assert
-            Assert.Collection(
-                result,
-                document =>
-                {
-                    Assert.Equal("C:\\From\\Index.cshtml", document.FilePath);
-                    Assert.Equal("C:\\To\\NewIndex.cshtml", document.TargetPath);
-                },
-                document =>
-                {
-                    Assert.Equal("C:\\From\\About.cshtml", document.FilePath);
-                    Assert.Equal("C:\\To\\NewAbout.cshtml", document.TargetPath);
-                });
-        }
-
-        [Fact]
-        public void GetCurrentDocuments_ReturnsContentAndNoneItems()
-        {
-            // Arrange
-            ContentItems.Item("Index.cshtml", new Dictionary<string, string>()
-            {
-                [ItemReference.LinkPropertyName] = "NewIndex.cshtml",
-                [ItemReference.FullPathPropertyName] = "C:\\From\\Index.cshtml",
-            });
-            NoneItems.Item("About.cshtml", new Dictionary<string, string>()
-            {
-                [ItemReference.LinkPropertyName] = "NewAbout.cshtml",
-                [ItemReference.FullPathPropertyName] = "C:\\From\\About.cshtml",
-            });
-            var services = new TestProjectSystemServices("C:\\To\\Test.csproj");
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager);
-            var changes = new TestProjectChangeDescription[]
-            {
-                ContentItems.ToChange(),
-                NoneItems.ToChange(),
-            };
-            var update = services.CreateUpdate(changes).Value;
-
-            // Act
-            var result = host.GetCurrentDocuments(update);
-
-            // Assert
-            Assert.Collection(
-                result,
-                document =>
-                {
-                    Assert.Equal("C:\\From\\Index.cshtml", document.FilePath);
-                    Assert.Equal("C:\\To\\NewIndex.cshtml", document.TargetPath);
-                },
-                document =>
-                {
-                    Assert.Equal("C:\\From\\About.cshtml", document.FilePath);
-                    Assert.Equal("C:\\To\\NewAbout.cshtml", document.TargetPath);
-                });
-        }
-
-        [Fact]
-        public void TryGetRazorDocument_NoFilePath_ReturnsFalse()
-        {
-            // Arrange
-            var services = new TestProjectSystemServices("C:\\To\\Test.csproj");
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager);
-            var itemState = new Dictionary<string, string>()
-            {
-                [ItemReference.LinkPropertyName] = "Index.cshtml",
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = host.TryGetRazorDocument(itemState, out var document);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(document);
-        }
-
-        [Fact]
-        public void TryGetRazorDocument_NonRazorFilePath_ReturnsFalse()
-        {
-            // Arrange
-            var services = new TestProjectSystemServices("C:\\Path\\Test.csproj");
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager);
-            var itemState = new Dictionary<string, string>()
-            {
-                [ItemReference.FullPathPropertyName] = "C:\\Path\\site.css",
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = host.TryGetRazorDocument(itemState, out var document);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(document);
-        }
-
-        [Fact]
-        public void TryGetRazorDocument_NonRazorTargetPath_ReturnsFalse()
-        {
-            // Arrange
-            var services = new TestProjectSystemServices("C:\\Path\\To\\Test.csproj");
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager);
-            var itemState = new Dictionary<string, string>()
-            {
-                [ItemReference.LinkPropertyName] = "site.html",
-                [ItemReference.FullPathPropertyName] = "C:\\Path\\From\\Index.cshtml",
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = host.TryGetRazorDocument(itemState, out var document);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(document);
-        }
-
-        [Fact]
-        public void TryGetRazorDocument_JustFilePath_ReturnsTrue()
-        {
-            // Arrange
-            var expectedPath = "C:\\Path\\Index.cshtml";
-            var services = new TestProjectSystemServices("C:\\Path\\Test.csproj");
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager);
-            var itemState = new Dictionary<string, string>()
-            {
-                [ItemReference.FullPathPropertyName] = expectedPath,
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = host.TryGetRazorDocument(itemState, out var document);
-
-            // Assert
-            Assert.True(result);
-            Assert.Equal(expectedPath, document.FilePath);
-            Assert.Equal(expectedPath, document.TargetPath);
-        }
-
-        [Fact]
-        public void TryGetRazorDocument_LinkedFilepath_ReturnsTrue()
-        {
-            // Arrange
-            var expectedFullPath = "C:\\Path\\From\\Index.cshtml";
-            var expectedTargetPath = "C:\\Path\\To\\Index.cshtml";
-            var services = new TestProjectSystemServices("C:\\Path\\To\\Test.csproj");
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager);
-            var itemState = new Dictionary<string, string>()
-            {
-                [ItemReference.LinkPropertyName] = "Index.cshtml",
-                [ItemReference.FullPathPropertyName] = expectedFullPath,
-            }.ToImmutableDictionary();
-
-            // Act
-            var result = host.TryGetRazorDocument(itemState, out var document);
-
-            // Assert
-            Assert.True(result);
-            Assert.Equal(expectedFullPath, document.FilePath);
-            Assert.Equal(expectedTargetPath, document.TargetPath);
-        }
-
-        [ForegroundFact]
-        public async Task FallbackRazorProjectHost_ForegroundThread_CreateAndDispose_Succeeds()
-        {
-            // Arrange
-            var services = new TestProjectSystemServices("C:\\To\\Test.csproj");
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager);
-
-            // Act & Assert
-            await host.LoadAsync();
-            Assert.Empty(ProjectManager.Projects);
-
-            await host.DisposeAsync();
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task FallbackRazorProjectHost_BackgroundThread_CreateAndDispose_Succeeds()
-        {
-            // Arrange
-            var services = new TestProjectSystemServices("Test.csproj");
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager);
-
-            // Act & Assert
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            await Task.Run(async () => await host.DisposeAsync());
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact] // This can happen if the .xaml files aren't included correctly.
-        public async Task OnProjectChanged_NoRulesDefined()
-        {
-            // Arrange
-            var changes = new TestProjectChangeDescription[]
-            {
-            };
-
-            var services = new TestProjectSystemServices("Test.csproj");
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager)
-            {
-                AssemblyVersion = new Version(2, 0),
-            };
-
-            // Act & Assert
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task OnProjectChanged_ReadsProperties_InitializesProject()
-        {
-            // Arrange
-            ReferenceItems.Item("c:\\nuget\\Microsoft.AspNetCore.Mvc.razor.dll");
-            ContentItems.Item("Index.cshtml", new Dictionary<string, string>()
-            {
-                [ItemReference.FullPathPropertyName] = "C:\\Path\\Index.cshtml",
-            });
-            NoneItems.Item("About.cshtml", new Dictionary<string, string>()
-            {
-                [ItemReference.FullPathPropertyName] = "C:\\Path\\About.cshtml",
-            });
-
-            var changes = new TestProjectChangeDescription[]
-            {
-                ReferenceItems.ToChange(),
-                ContentItems.ToChange(),
-                NoneItems.ToChange(),
-            };
-
-            var services = new TestProjectSystemServices("C:\\Path\\Test.csproj");
-
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager)
-            {
-                AssemblyVersion = new Version(2, 0), // Mock for reading the assembly's version
-            };
-
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert
-            var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("C:\\Path\\Test.csproj", snapshot.FilePath);
-            Assert.Same(FallbackRazorConfiguration.MVC_2_0, snapshot.Configuration);
-
-            Assert.Collection(
-                snapshot.DocumentFilePaths,
-                filePath => Assert.Equal("C:\\Path\\Index.cshtml", filePath),
-                filePath => Assert.Equal("C:\\Path\\About.cshtml", filePath));
-
-            await Task.Run(async () => await host.DisposeAsync());
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task OnProjectChanged_NoAssemblyFound_DoesNotIniatializeProject()
-        {
-            // Arrange
-            var changes = new TestProjectChangeDescription[]
-            {
-                ReferenceItems.ToChange(),
-            };
-            var services = new TestProjectSystemServices("Test.csproj");
-
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager);
-
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert
-            Assert.Empty(ProjectManager.Projects);
-
-            await Task.Run(async () => await host.DisposeAsync());
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task OnProjectChanged_AssemblyFoundButCannotReadVersion_DoesNotIniatializeProject()
-        {
-            // Arrange
-            ReferenceItems.Item("c:\\nuget\\Microsoft.AspNetCore.Mvc.razor.dll");
-
-            var changes = new TestProjectChangeDescription[]
-            {
-                ReferenceItems.ToChange(),
-            };
-
-            var services = new TestProjectSystemServices("Test.csproj");
-
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager);
-
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert
-            Assert.Empty(ProjectManager.Projects);
-
-            await Task.Run(async () => await host.DisposeAsync());
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task OnProjectChanged_UpdateProject_Succeeds()
-        {
-            // Arrange
-            ReferenceItems.Item("c:\\nuget\\Microsoft.AspNetCore.Mvc.razor.dll");
-            var afterChangeContentItems = new ItemCollection(ManagedProjectSystemSchema.ContentItem.SchemaName);
-            ContentItems.Item("Index.cshtml", new Dictionary<string, string>()
-            {
-                [ItemReference.FullPathPropertyName] = "C:\\Path\\Index.cshtml",
-            });
-
-            var initialChanges = new TestProjectChangeDescription[]
-            {
-                ReferenceItems.ToChange(),
-                ContentItems.ToChange(),
-            };
-            var changes = new TestProjectChangeDescription[]
-            {
-                ReferenceItems.ToChange(),
-                afterChangeContentItems.ToChange(ContentItems.ToSnapshot()),
-            };
-
-            var services = new TestProjectSystemServices("C:\\Path\\Test.csproj");
-
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager)
-            {
-                AssemblyVersion = new Version(2, 0),
-            };
-
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act - 1
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(initialChanges)));
-
-            // Assert - 1
-            var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("C:\\Path\\Test.csproj", snapshot.FilePath);
-            Assert.Same(FallbackRazorConfiguration.MVC_2_0, snapshot.Configuration);
-            var filePath = Assert.Single(snapshot.DocumentFilePaths);
-            Assert.Equal("C:\\Path\\Index.cshtml", filePath);
-
-            // Act - 2
-            host.AssemblyVersion = new Version(1, 0);
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert - 2
-            snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("C:\\Path\\Test.csproj", snapshot.FilePath);
-            Assert.Same(FallbackRazorConfiguration.MVC_1_0, snapshot.Configuration);
-            Assert.Empty(snapshot.DocumentFilePaths);
-
-            await Task.Run(async () => await host.DisposeAsync());
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task OnProjectChanged_VersionRemoved_DeinitializesProject()
-        {
-            // Arrange
-            ReferenceItems.Item("c:\\nuget\\Microsoft.AspNetCore.Mvc.razor.dll");
-
-            var changes = new TestProjectChangeDescription[]
-            {
-                ReferenceItems.ToChange(),
-            };
-
-            var services = new TestProjectSystemServices("Test.csproj");
-
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager)
-            {
-                AssemblyVersion = new Version(2, 0),
-            };
-
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act - 1
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert - 1
-            var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("Test.csproj", snapshot.FilePath);
-            Assert.Same(FallbackRazorConfiguration.MVC_2_0, snapshot.Configuration);
-
-            // Act - 2
-            host.AssemblyVersion = null;
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert - 2
-            Assert.Empty(ProjectManager.Projects);
-
-            await Task.Run(async () => await host.DisposeAsync());
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task OnProjectChanged_AfterDispose_IgnoresUpdate()
-        {
-            // Arrange
-            ReferenceItems.Item("c:\\nuget\\Microsoft.AspNetCore.Mvc.razor.dll");
-            ContentItems.Item("Index.cshtml", new Dictionary<string, string>()
-            {
-                [ItemReference.FullPathPropertyName] = "C:\\Path\\Index.cshtml",
-            });
-
-            var changes = new TestProjectChangeDescription[]
-            {
-                ReferenceItems.ToChange(),
-                ContentItems.ToChange(),
-            };
-
-            var services = new TestProjectSystemServices("C:\\Path\\Test.csproj");
-
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager)
-            {
-                AssemblyVersion = new Version(2, 0),
-            };
-
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act - 1
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert - 1
-            var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("C:\\Path\\Test.csproj", snapshot.FilePath);
-            Assert.Same(FallbackRazorConfiguration.MVC_2_0, snapshot.Configuration);
-            var filePath = Assert.Single(snapshot.DocumentFilePaths);
-            Assert.Equal("C:\\Path\\Index.cshtml", filePath);
-
-            // Act - 2
-            await Task.Run(async () => await host.DisposeAsync());
-
-            // Assert - 2
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act - 3
-            host.AssemblyVersion = new Version(1, 1);
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert - 3
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        [ForegroundFact]
-        public async Task OnProjectRenamed_RemovesHostProject_CopiesConfiguration()
-        {
-            // Arrange
-            ReferenceItems.Item("c:\\nuget\\Microsoft.AspNetCore.Mvc.razor.dll");
-
-            var changes = new TestProjectChangeDescription[]
-            {
-                ReferenceItems.ToChange(),
-            };
-
-            var services = new TestProjectSystemServices("Test.csproj");
-
-            var host = new TestFallbackRazorProjectHost(services, Workspace, ProjectManager)
-            {
-                AssemblyVersion = new Version(2, 0), // Mock for reading the assembly's version
-            };
-
-            await Task.Run(async () => await host.LoadAsync());
-            Assert.Empty(ProjectManager.Projects);
-
-            // Act - 1
-            await Task.Run(async () => await host.OnProjectChanged(services.CreateUpdate(changes)));
-
-            // Assert - 1
-            var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("Test.csproj", snapshot.FilePath);
-            Assert.Same(FallbackRazorConfiguration.MVC_2_0, snapshot.Configuration);
-
-            // Act - 2
-            services.UnconfiguredProject.FullPath = "Test2.csproj";
-            await Task.Run(async () => await host.OnProjectRenamingAsync());
-
-            // Assert - 1
-            snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("Test2.csproj", snapshot.FilePath);
-            Assert.Same(FallbackRazorConfiguration.MVC_2_0, snapshot.Configuration);
-
-            await Task.Run(async () => await host.DisposeAsync());
-            Assert.Empty(ProjectManager.Projects);
-        }
-
-        private class TestFallbackRazorProjectHost : FallbackRazorProjectHost
-        {
-            internal TestFallbackRazorProjectHost(IUnconfiguredProjectCommonServices commonServices, Workspace workspace, ProjectSnapshotManagerBase projectManager)
-                : base(commonServices, workspace, projectManager)
-            {
-            }
-
-            public Version AssemblyVersion { get; set; }
-
-            protected override Version GetAssemblyVersion(string filePath)
-            {
-                return AssemblyVersion;
-            }
-        }
-
-        private class TestProjectSnapshotManager : DefaultProjectSnapshotManager
-        {
-            public TestProjectSnapshotManager(ForegroundDispatcher dispatcher, Workspace workspace)
-                : base(dispatcher, Mock.Of<ErrorReporter>(), Array.Empty<ProjectSnapshotChangeTrigger>(), workspace)
-            {
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/ItemCollection.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/ItemCollection.cs
deleted file mode 100644
index de8da804c447..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/ItemCollection.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using Microsoft.VisualStudio.ProjectSystem.Properties;
-using Xunit;
-
-namespace Microsoft.VisualStudio.ProjectSystem
-{
-    internal class ItemCollection
-    {
-        private readonly string _ruleName;
-        private readonly Dictionary<string, Dictionary<string, string>> _items;
-
-        public ItemCollection(string ruleName)
-        {
-            _ruleName = ruleName;
-            _items = new Dictionary<string, Dictionary<string, string>>();
-        }
-
-        public void Item(string item)
-        {
-            Item(item, new Dictionary<string, string>());
-        }
-
-        public void Item(string item, Dictionary<string, string> properties)
-        {
-            _items[item] = properties;
-        }
-
-        public void RemoveItem(string item)
-        {
-            _items.Remove(item);
-        }
-
-        public void Property(string item, string key)
-        {
-            _items[item][key] = null;
-        }
-
-        public void Property(string item, string key, string value)
-        {
-            _items[item][key] = value;
-        }
-
-        public TestProjectRuleSnapshot ToSnapshot()
-        {
-            return TestProjectRuleSnapshot.CreateItems(_ruleName, _items);
-        }
-
-        public TestProjectChangeDescription ToChange()
-        {
-            return ToChange(new TestProjectRuleSnapshot(
-                _ruleName,
-                ImmutableDictionary<string, IImmutableDictionary<string, string>>.Empty,
-                ImmutableDictionary<string, string>.Empty,
-                ImmutableDictionary<NamedIdentity, IComparable>.Empty));
-        }
-
-        public TestProjectChangeDescription ToChange(IProjectRuleSnapshot before)
-        {
-            Assert.Equal(_ruleName, before.RuleName);
-            return new TestProjectChangeDescription(before, ToSnapshot());
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/PropertyCollection.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/PropertyCollection.cs
deleted file mode 100644
index bc57076c342c..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/PropertyCollection.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using Microsoft.VisualStudio.ProjectSystem.Properties;
-
-namespace Microsoft.VisualStudio.ProjectSystem
-{
-    internal class PropertyCollection
-    {
-        private readonly string _ruleName;
-        private readonly Dictionary<string, string> _properties;
-
-        public PropertyCollection(string ruleName)
-        {
-            _ruleName = ruleName;
-            _properties = new Dictionary<string, string>();
-        }
-
-        public void Property(string key)
-        {
-            _properties[key] = null;
-        }
-
-        public void Property(string key, string value)
-        {
-            _properties[key] = value;
-        }
-
-        public TestProjectRuleSnapshot ToSnapshot()
-        {
-            return TestProjectRuleSnapshot.CreateProperties(_ruleName, _properties);
-        }
-
-        public TestProjectChangeDescription ToChange()
-        {
-            return ToChange(new TestProjectRuleSnapshot(
-                _ruleName,
-                ImmutableDictionary<string, IImmutableDictionary<string, string>>.Empty,
-                ImmutableDictionary<string, string>.Empty,
-                ImmutableDictionary<NamedIdentity, IComparable>.Empty));
-        }
-
-        public TestProjectChangeDescription ToChange(IProjectRuleSnapshot before)
-        {
-            return new TestProjectChangeDescription(before, ToSnapshot());
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestAssemblyReference.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestAssemblyReference.cs
deleted file mode 100644
index b80f5e85bac2..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestAssemblyReference.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.VisualStudio.ProjectSystem.Properties;
-
-namespace Microsoft.VisualStudio.ProjectSystem.References
-{
-    internal class TestAssemblyReference : IAssemblyReference
-    {
-        public AssemblyName AssemblyName { get; set; }
-
-        public string FullPath { get; set; }
-
-        public IProjectProperties Metadata => throw new System.NotImplementedException();
-        
-        public Task<AssemblyName> GetAssemblyNameAsync()
-        {
-            return Task.FromResult(AssemblyName);
-        }
-
-        public Task<bool> GetCopyLocalAsync()
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public Task<bool> GetCopyLocalSatelliteAssembliesAsync()
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public Task<string> GetDescriptionAsync()
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public Task<string> GetFullPathAsync()
-        {
-            return Task.FromResult(FullPath);
-        }
-
-        public Task<string> GetNameAsync()
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public Task<bool> GetReferenceOutputAssemblyAsync()
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public Task<string> GetRequiredTargetFrameworkAsync()
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public Task<bool> GetSpecificVersionAsync()
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public Task<bool> IsWinMDFileAsync()
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestProjectChangeDescription.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestProjectChangeDescription.cs
deleted file mode 100644
index 5a4f72710934..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestProjectChangeDescription.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information
-
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using Microsoft.VisualStudio.ProjectSystem.Properties;
-
-namespace Microsoft.VisualStudio.ProjectSystem
-{
-    internal class TestProjectChangeDescription : IProjectChangeDescription
-    {
-        public TestProjectChangeDescription(IProjectRuleSnapshot before, IProjectRuleSnapshot after)
-        {
-            Before = before;
-            After = after;
-
-            Difference = Diff.Create(before, after);
-        }
-
-        public IProjectRuleSnapshot Before { get; }
-
-        public IProjectChangeDiff Difference { get; }
-
-        public IProjectRuleSnapshot After { get; }
-
-        private class Diff : IProjectChangeDiff
-        {
-            public static Diff Create(IProjectRuleSnapshot before, IProjectRuleSnapshot after)
-            {
-                var addedItems = new HashSet<string>(after.Items.Keys);
-                addedItems.ExceptWith(before.Items.Keys);
-
-                var removedItems = new HashSet<string>(before.Items.Keys);
-                removedItems.ExceptWith(after.Items.Keys);
-
-                // changed items must be present in both sets, but have different properties.
-                var changedItems = new HashSet<string>(before.Items.Keys);
-                changedItems.IntersectWith(after.Items.Keys);
-                changedItems.RemoveWhere(key =>
-                {
-                    var x = before.Items[key];
-                    var y = after.Items[key];
-
-                    if (x.Count != y.Count)
-                    {
-                        return true;
-                    }
-
-                    foreach (var kvp in x)
-                    {
-                        if (!y.Contains(kvp))
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
-                });
-
-                var changedProperties = new HashSet<string>(before.Properties.Keys);
-                changedProperties.RemoveWhere(key =>
-                {
-                    var x = before.Properties[key];
-                    var y = after.Properties[key];
-                    return object.Equals(x, y);
-                });
-
-                return new Diff()
-                {
-                    AddedItems = addedItems.ToImmutableHashSet(),
-                    RemovedItems = removedItems.ToImmutableHashSet(),
-                    ChangedItems = changedItems.ToImmutableHashSet(),
-
-                    // We ignore renamed items.
-                    RenamedItems = ImmutableDictionary<string, string>.Empty,
-
-                    ChangedProperties = changedProperties.ToImmutableHashSet(),
-                };
-            }
-
-            public IImmutableSet<string> AddedItems { get; private set; }
-
-            public IImmutableSet<string> RemovedItems { get; private set; }
-
-            public IImmutableSet<string> ChangedItems { get; private set; }
-
-            public IImmutableDictionary<string, string> RenamedItems { get; private set; }
-
-            public IImmutableSet<string> ChangedProperties { get; private set; }
-
-            public bool AnyChanges =>
-                AddedItems.Count > 0 ||
-                RemovedItems.Count > 0 ||
-                ChangedItems.Count > 0 ||
-                RenamedItems.Count > 0 ||
-                ChangedProperties.Count > 0;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestProjectRuleSnapshot.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestProjectRuleSnapshot.cs
deleted file mode 100644
index 409df58e1d3a..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestProjectRuleSnapshot.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using Microsoft.VisualStudio.ProjectSystem.Properties;
-
-namespace Microsoft.VisualStudio.ProjectSystem
-{
-    internal class TestProjectRuleSnapshot : IProjectRuleSnapshot
-    {
-        public static TestProjectRuleSnapshot CreateProperties(string ruleName, Dictionary<string, string> properties)
-        {
-            return new TestProjectRuleSnapshot(
-                ruleName,
-                items: ImmutableDictionary<string, IImmutableDictionary<string, string>>.Empty,
-                properties: properties.ToImmutableDictionary(),
-                dataSourceVersions: ImmutableDictionary<NamedIdentity, IComparable>.Empty);
-        }
-
-        public static TestProjectRuleSnapshot CreateItems(string ruleName, Dictionary<string, Dictionary<string, string>> items)
-        {
-            return new TestProjectRuleSnapshot(
-                ruleName,
-                items: items.ToImmutableDictionary(kvp => kvp.Key, kvp => (IImmutableDictionary<string, string>)kvp.Value.ToImmutableDictionary()),
-                properties: ImmutableDictionary<string, string>.Empty,
-                dataSourceVersions: ImmutableDictionary<NamedIdentity, IComparable>.Empty);
-        }
-
-        public TestProjectRuleSnapshot(
-            string ruleName,
-            IImmutableDictionary<string, IImmutableDictionary<string, string>> items,
-            IImmutableDictionary<string, string> properties,
-            IImmutableDictionary<NamedIdentity, IComparable> dataSourceVersions)
-        {
-            RuleName = ruleName;
-            Items = items;
-            Properties = properties;
-            DataSourceVersions = dataSourceVersions;
-        }
-
-        public string RuleName { get; }
-
-        public IImmutableDictionary<string, IImmutableDictionary<string, string>> Items { get; }
-
-        public IImmutableDictionary<string, string> Properties { get; }
-
-        public IImmutableDictionary<NamedIdentity, IComparable> DataSourceVersions { get; }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestProjectSystemServices.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestProjectSystemServices.cs
deleted file mode 100644
index 78937189f9ba..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestProjectSystemServices.cs
+++ /dev/null
@@ -1,862 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Threading.Tasks.Dataflow;
-using System.Xml;
-using Microsoft.Build.Execution;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Framework.XamlTypes;
-using Microsoft.VisualStudio.Composition;
-using Microsoft.VisualStudio.ProjectSystem;
-using Microsoft.VisualStudio.ProjectSystem.Build;
-using Microsoft.VisualStudio.ProjectSystem.Properties;
-using Microsoft.VisualStudio.ProjectSystem.References;
-using Microsoft.VisualStudio.Threading;
-using Moq;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class TestProjectSystemServices : IUnconfiguredProjectCommonServices
-    {
-        public TestProjectSystemServices(string fullPath, params TestPropertyData[] data)
-        {
-            ProjectService = new TestProjectService();
-            ThreadingService = ProjectService.Services.ThreadingPolicy;
-
-            UnconfiguredProject = new TestUnconfiguredProject(ProjectService, fullPath);
-            ProjectService.LoadedUnconfiguredProjects.Add(UnconfiguredProject);
-
-            ActiveConfiguredProject = new TestConfiguredProject(UnconfiguredProject, data);
-            UnconfiguredProject.LoadedConfiguredProjects.Add(ActiveConfiguredProject);
-
-            ActiveConfiguredProjectAssemblyReferences = new TestAssemblyReferencesService();
-            ActiveConfiguredProjectRazorProperties = new Rules.RazorProjectProperties(ActiveConfiguredProject, UnconfiguredProject);
-            ActiveConfiguredProjectSubscription = new TestActiveConfiguredProjectSubscriptionService();
-
-            TasksService = new TestProjectAsynchronousTasksService(ProjectService, UnconfiguredProject, ActiveConfiguredProject);
-        }
-
-        public TestProjectServices Services { get; }
-
-        public TestProjectService ProjectService { get; }
-
-        public TestUnconfiguredProject UnconfiguredProject { get; }
-
-        public TestConfiguredProject ActiveConfiguredProject { get; }
-
-        public TestAssemblyReferencesService ActiveConfiguredProjectAssemblyReferences { get; }
-
-        public Rules.RazorProjectProperties ActiveConfiguredProjectRazorProperties { get; }
-
-        public TestActiveConfiguredProjectSubscriptionService ActiveConfiguredProjectSubscription { get; }
-
-        public TestProjectAsynchronousTasksService TasksService { get; }
-
-        public TestThreadingService ThreadingService { get; }
-
-        ConfiguredProject IUnconfiguredProjectCommonServices.ActiveConfiguredProject => ActiveConfiguredProject;
-
-        IAssemblyReferencesService IUnconfiguredProjectCommonServices.ActiveConfiguredProjectAssemblyReferences => ActiveConfiguredProjectAssemblyReferences;
-
-        IPackageReferencesService IUnconfiguredProjectCommonServices.ActiveConfiguredProjectPackageReferences => throw new NotImplementedException();
-
-        Rules.RazorProjectProperties IUnconfiguredProjectCommonServices.ActiveConfiguredProjectRazorProperties => ActiveConfiguredProjectRazorProperties;
-
-        IActiveConfiguredProjectSubscriptionService IUnconfiguredProjectCommonServices.ActiveConfiguredProjectSubscription => ActiveConfiguredProjectSubscription;
-
-        IProjectAsynchronousTasksService IUnconfiguredProjectCommonServices.TasksService => TasksService;
-
-        IProjectThreadingService IUnconfiguredProjectCommonServices.ThreadingService => ThreadingService;
-
-        UnconfiguredProject IUnconfiguredProjectCommonServices.UnconfiguredProject => UnconfiguredProject;
-
-        public IProjectVersionedValue<IProjectSubscriptionUpdate> CreateUpdate(params TestProjectChangeDescription[] descriptions)
-        {
-            return new ProjectVersionedValue<IProjectSubscriptionUpdate>(
-                value: new ProjectSubscriptionUpdate(
-                    projectChanges: descriptions.ToImmutableDictionary(d => d.After.RuleName, d => (IProjectChangeDescription)d),
-                    projectConfiguration: ActiveConfiguredProject.ProjectConfiguration),
-                dataSourceVersions: ImmutableDictionary<NamedIdentity, IComparable>.Empty);
-        }
-
-        public class TestProjectServices : IProjectServices
-        {
-            public TestProjectServices(TestProjectService projectService)
-            {
-                ProjectService = projectService;
-                ThreadingPolicy = new TestThreadingService();
-            }
-
-            public TestProjectService ProjectService { get; }
-
-            public TestThreadingService ThreadingPolicy { get; }
-
-            IProjectLockService IProjectServices.ProjectLockService => throw new NotImplementedException();
-
-            IProjectThreadingService IProjectServices.ThreadingPolicy => ThreadingPolicy;
-
-            IProjectFaultHandlerService IProjectServices.FaultHandler => throw new NotImplementedException();
-
-            IProjectReloader IProjectServices.ProjectReloader => throw new NotImplementedException();
-
-            ExportProvider IProjectCommonServices.ExportProvider => throw new NotImplementedException();
-
-            IProjectDataSourceRegistry IProjectCommonServices.DataSourceRegistry => throw new NotImplementedException();
-
-            IProjectService IProjectCommonServices.ProjectService => ProjectService;
-
-            IProjectCapabilitiesScope IProjectCommonServices.Capabilities => throw new NotImplementedException();
-        }
-
-        public class TestProjectService : IProjectService
-        {
-            public TestProjectService()
-            {
-                LoadedUnconfiguredProjects = new List<TestUnconfiguredProject>();
-                Services = new TestProjectServices(this);
-            }
-
-            public List<TestUnconfiguredProject> LoadedUnconfiguredProjects { get; }
-
-            public TestProjectServices Services { get; }
-
-            IEnumerable<UnconfiguredProject> IProjectService.LoadedUnconfiguredProjects => throw new NotImplementedException();
-
-            IProjectServices IProjectService.Services => Services;
-
-            IProjectCapabilitiesScope IProjectService.Capabilities => throw new NotImplementedException();
-
-            Task<UnconfiguredProject> IProjectService.LoadProjectAsync(string projectLocation, IImmutableSet<string> projectCapabilities)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task<UnconfiguredProject> IProjectService.LoadProjectAsync(XmlReader reader, IImmutableSet<string> projectCapabilities)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task<UnconfiguredProject> IProjectService.LoadProjectAsync(string projectLocation, bool delayAutoLoad, IImmutableSet<string> projectCapabilities)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task IProjectService.UnloadProjectAsync(UnconfiguredProject project)
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        public class TestUnconfiguredProject : UnconfiguredProject
-        {
-            public TestUnconfiguredProject(TestProjectService projectService, string fullPath)
-            {
-                ProjectService = projectService;
-                FullPath = fullPath;
-
-                LoadedConfiguredProjects = new List<TestConfiguredProject>();
-            }
-
-            public TestProjectService ProjectService { get; }
-
-            public string FullPath { get; set; }
-
-            public List<TestConfiguredProject> LoadedConfiguredProjects { get; }
-
-            string UnconfiguredProject.FullPath => FullPath;
-            bool UnconfiguredProject.RequiresReloadForExternalFileChange => throw new NotImplementedException();
-
-            IProjectCapabilitiesScope UnconfiguredProject.Capabilities => throw new NotImplementedException();
-
-            IProjectService UnconfiguredProject.ProjectService => ProjectService;
-
-            IUnconfiguredProjectServices UnconfiguredProject.Services => throw new NotImplementedException();
-
-            IEnumerable<ConfiguredProject> UnconfiguredProject.LoadedConfiguredProjects => LoadedConfiguredProjects;
-
-            bool UnconfiguredProject.IsLoading => throw new NotImplementedException();
-
-            event AsyncEventHandler UnconfiguredProject.ProjectUnloading
-            {
-                add
-                {
-                    throw new NotImplementedException();
-                }
-
-                remove
-                {
-                    throw new NotImplementedException();
-                }
-            }
-
-            event AsyncEventHandler<ProjectRenamedEventArgs> UnconfiguredProject.ProjectRenaming
-            {
-                add
-                {
-                }
-
-                remove
-                {
-                }
-            }
-
-            event AsyncEventHandler<ProjectRenamedEventArgs> UnconfiguredProject.ProjectRenamedOnWriter
-            {
-                add
-                {
-                    throw new NotImplementedException();
-                }
-
-                remove
-                {
-                    throw new NotImplementedException();
-                }
-            }
-
-            event AsyncEventHandler<ProjectRenamedEventArgs> UnconfiguredProject.ProjectRenamed
-            {
-                add
-                {
-                    throw new NotImplementedException();
-                }
-
-                remove
-                {
-                    throw new NotImplementedException();
-                }
-            }
-
-            Task<bool> UnconfiguredProject.CanRenameAsync(string newFilePath)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task<Encoding> UnconfiguredProject.GetFileEncodingAsync()
-            {
-                throw new NotImplementedException();
-            }
-
-            Task<bool> UnconfiguredProject.GetIsDirtyAsync()
-            {
-                throw new NotImplementedException();
-            }
-
-            Task<ConfiguredProject> UnconfiguredProject.GetSuggestedConfiguredProjectAsync()
-            {
-                throw new NotImplementedException();
-            }
-
-            Task<ConfiguredProject> UnconfiguredProject.LoadConfiguredProjectAsync(string name, IImmutableDictionary<string, string> configurationProperties)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task<ConfiguredProject> UnconfiguredProject.LoadConfiguredProjectAsync(ProjectConfiguration projectConfiguration)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task UnconfiguredProject.ReloadAsync(bool immediately)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task UnconfiguredProject.RenameAsync(string newFilePath)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task UnconfiguredProject.SaveAsync(string filePath)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task UnconfiguredProject.SaveCopyAsync(string filePath, Encoding fileEncoding)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task UnconfiguredProject.SaveUserFileAsync()
-            {
-                throw new NotImplementedException();
-            }
-
-            Task UnconfiguredProject.SetFileEncodingAsync(Encoding value)
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        public class TestConfiguredProject : ConfiguredProject
-        {
-            public TestConfiguredProject(TestUnconfiguredProject unconfiguredProject, TestPropertyData[] data)
-            {
-                UnconfiguredProject = unconfiguredProject;
-                Services = new TestConfiguredProjectServices(this, data);
-
-                ProjectConfiguration = new StandardProjectConfiguration(
-                    "Debug|AnyCPU",
-                    ImmutableDictionary<string, string>.Empty.Add("Configuration", "Debug").Add("Platform", "AnyCPU"));
-            }
-
-            public TestUnconfiguredProject UnconfiguredProject { get; }
-
-            public ProjectConfiguration ProjectConfiguration { get; }
-
-            public TestConfiguredProjectServices Services { get; }
-
-            IComparable ConfiguredProject.ProjectVersion => throw new NotImplementedException();
-
-            IReceivableSourceBlock<IComparable> ConfiguredProject.ProjectVersionBlock => throw new NotImplementedException();
-
-            ProjectConfiguration ConfiguredProject.ProjectConfiguration => ProjectConfiguration;
-
-            IProjectCapabilitiesScope ConfiguredProject.Capabilities => throw new NotImplementedException();
-
-            UnconfiguredProject ConfiguredProject.UnconfiguredProject => UnconfiguredProject;
-
-            IConfiguredProjectServices ConfiguredProject.Services => Services;
-
-            event AsyncEventHandler ConfiguredProject.ProjectUnloading
-            {
-                add
-                {
-                    throw new NotImplementedException();
-                }
-
-                remove
-                {
-                    throw new NotImplementedException();
-                }
-            }
-
-            event EventHandler ConfiguredProject.ProjectChanged
-            {
-                add
-                {
-                    throw new NotImplementedException();
-                }
-
-                remove
-                {
-                    throw new NotImplementedException();
-                }
-            }
-
-            event EventHandler ConfiguredProject.ProjectChangedSynchronous
-            {
-                add
-                {
-                    throw new NotImplementedException();
-                }
-
-                remove
-                {
-                    throw new NotImplementedException();
-                }
-            }
-
-            void ConfiguredProject.NotifyProjectChange()
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        public class TestConfiguredProjectServices : IConfiguredProjectServices
-        {
-            public TestConfiguredProjectServices(TestConfiguredProject configuredProject, TestPropertyData[] data)
-            {
-                ConfiguredProject = configuredProject;
-
-                AdditionalRuleDefinitions = new TestAdditionalRuleDefinitionsService();
-                PropertyPagesCatalog = new TestPropertyPagesCatalogProvider(new TestPropertyPagesCatalog(data));
-            }
-
-            public TestConfiguredProject ConfiguredProject { get; }
-
-            public TestAdditionalRuleDefinitionsService AdditionalRuleDefinitions { get; }
-
-            public TestPropertyPagesCatalogProvider PropertyPagesCatalog { get; }
-
-            IOutputGroupsService IConfiguredProjectServices.OutputGroups => throw new NotImplementedException();
-
-            IBuildProject IConfiguredProjectServices.Build => throw new NotImplementedException();
-
-            IBuildSupport IConfiguredProjectServices.BuildSupport => throw new NotImplementedException();
-
-            IAssemblyReferencesService IConfiguredProjectServices.AssemblyReferences => throw new NotImplementedException();
-
-            IComReferencesService IConfiguredProjectServices.ComReferences => throw new NotImplementedException();
-
-            ISdkReferencesService IConfiguredProjectServices.SdkReferences => throw new NotImplementedException();
-
-            IPackageReferencesService IConfiguredProjectServices.PackageReferences => throw new NotImplementedException();
-
-            IWinRTReferencesService IConfiguredProjectServices.WinRTReferences => throw new NotImplementedException();
-
-            IBuildDependencyProjectReferencesService IConfiguredProjectServices.ProjectReferences => throw new NotImplementedException();
-
-            IProjectItemProvider IConfiguredProjectServices.SourceItems => throw new NotImplementedException();
-
-            IProjectPropertiesProvider IConfiguredProjectServices.ProjectPropertiesProvider => throw new NotImplementedException();
-
-            IProjectPropertiesProvider IConfiguredProjectServices.UserPropertiesProvider => throw new NotImplementedException();
-
-            IProjectAsynchronousTasksService IConfiguredProjectServices.ProjectAsynchronousTasks => throw new NotImplementedException();
-
-            IAdditionalRuleDefinitionsService IConfiguredProjectServices.AdditionalRuleDefinitions => AdditionalRuleDefinitions;
-
-            IPropertyPagesCatalogProvider IConfiguredProjectServices.PropertyPagesCatalog => PropertyPagesCatalog;
-
-            IProjectSubscriptionService IConfiguredProjectServices.ProjectSubscription => throw new NotImplementedException();
-
-            IProjectSnapshotService IConfiguredProjectServices.ProjectSnapshotService => throw new NotImplementedException();
-
-            object IConfiguredProjectServices.HostObject => throw new NotImplementedException();
-
-            ExportProvider IProjectCommonServices.ExportProvider => throw new NotImplementedException();
-
-            IProjectDataSourceRegistry IProjectCommonServices.DataSourceRegistry => throw new NotImplementedException();
-
-            IProjectService IProjectCommonServices.ProjectService => ConfiguredProject.UnconfiguredProject.ProjectService;
-
-            IProjectCapabilitiesScope IProjectCommonServices.Capabilities => throw new NotImplementedException();
-        }
-
-        public class TestAdditionalRuleDefinitionsService : IAdditionalRuleDefinitionsService
-        {
-            IProjectVersionedValue<IAdditionalRuleDefinitions> IAdditionalRuleDefinitionsService.AdditionalRuleDefinitions => throw new NotImplementedException();
-
-            IReceivableSourceBlock<IProjectVersionedValue<IAdditionalRuleDefinitions>> IProjectValueDataSource<IAdditionalRuleDefinitions>.SourceBlock => throw new NotImplementedException();
-
-            ISourceBlock<IProjectVersionedValue<object>> IProjectValueDataSource.SourceBlock => throw new NotImplementedException();
-
-            NamedIdentity IProjectValueDataSource.DataSourceKey => throw new NotImplementedException();
-
-            IComparable IProjectValueDataSource.DataSourceVersion => throw new NotImplementedException();
-
-            bool IAdditionalRuleDefinitionsService.AddRuleDefinition(string path, string context)
-            {
-                return false;
-            }
-
-            bool IAdditionalRuleDefinitionsService.AddRuleDefinition(Rule rule, string context)
-            {
-                return false;
-            }
-
-            IDisposable IJoinableProjectValueDataSource.Join()
-            {
-                throw new NotImplementedException();
-            }
-
-            bool IAdditionalRuleDefinitionsService.RemoveRuleDefinition(string path)
-            {
-                return false;
-            }
-
-            bool IAdditionalRuleDefinitionsService.RemoveRuleDefinition(Rule rule)
-            {
-                return false;
-            }
-        }
-
-        public class TestPropertyPagesCatalogProvider : IPropertyPagesCatalogProvider
-        {
-            public TestPropertyPagesCatalogProvider(TestPropertyPagesCatalog catalog)
-            {
-                Catalog = catalog;
-                CatalogsByContext = new Dictionary<string, IPropertyPagesCatalog>()
-                {
-                    { "Project", catalog },
-                };
-            }
-
-            public TestPropertyPagesCatalog Catalog { get; }
-
-            public Dictionary<string, IPropertyPagesCatalog> CatalogsByContext { get; }
-
-            public IReceivableSourceBlock<IProjectVersionedValue<IProjectCatalogSnapshot>> SourceBlock => throw new NotImplementedException();
-
-            public NamedIdentity DataSourceKey => throw new NotImplementedException();
-
-            public IComparable DataSourceVersion => throw new NotImplementedException();
-
-            ISourceBlock<IProjectVersionedValue<object>> IProjectValueDataSource.SourceBlock => throw new NotImplementedException();
-
-            public Task<IPropertyPagesCatalog> GetCatalogAsync(string name, CancellationToken cancellationToken = default)
-            {
-                return Task.FromResult(CatalogsByContext[name]);
-            }
-
-            public Task<IImmutableDictionary<string, IPropertyPagesCatalog>> GetCatalogsAsync(CancellationToken cancellationToken = default)
-            {
-                return Task.FromResult<IImmutableDictionary<string, IPropertyPagesCatalog>>(CatalogsByContext.ToImmutableDictionary());
-            }
-
-            public IPropertyPagesCatalog GetMemoryOnlyCatalog(string context)
-            {
-                return Catalog;
-            }
-
-            public IDisposable Join()
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        public class TestActiveConfiguredProjectSubscriptionService : IActiveConfiguredProjectSubscriptionService
-        {
-            public TestActiveConfiguredProjectSubscriptionService()
-            {
-                JointRuleBlock = new BufferBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>>();
-                JointRuleSource = new TestProjectValueDataSource<IProjectSubscriptionUpdate>(JointRuleBlock);
-            }
-
-            public BufferBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> JointRuleBlock { get; }
-
-            public TestProjectValueDataSource<IProjectSubscriptionUpdate> JointRuleSource { get; }
-
-            IReceivableSourceBlock<IProjectVersionedValue<IProjectSnapshot>> IProjectSubscriptionService.ProjectBlock => throw new NotImplementedException();
-
-            IProjectValueDataSource<IProjectSnapshot> IProjectSubscriptionService.ProjectSource => throw new NotImplementedException();
-
-            IProjectValueDataSource<IProjectImportTreeSnapshot> IProjectSubscriptionService.ImportTreeSource => throw new NotImplementedException();
-
-            IProjectValueDataSource<IProjectSharedFoldersSnapshot> IProjectSubscriptionService.SharedFoldersSource => throw new NotImplementedException();
-
-            IProjectValueDataSource<IImmutableDictionary<string, IOutputGroup>> IProjectSubscriptionService.OutputGroupsSource => throw new NotImplementedException();
-
-            IReceivableSourceBlock<IProjectVersionedValue<IProjectCatalogSnapshot>> IProjectSubscriptionService.ProjectCatalogBlock => throw new NotImplementedException();
-
-            IProjectValueDataSource<IProjectCatalogSnapshot> IProjectSubscriptionService.ProjectCatalogSource => throw new NotImplementedException();
-
-            IReceivableSourceBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> IProjectSubscriptionService.ProjectRuleBlock => throw new NotImplementedException();
-
-            IProjectValueDataSource<IProjectSubscriptionUpdate> IProjectSubscriptionService.ProjectRuleSource => throw new NotImplementedException();
-
-            IReceivableSourceBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> IProjectSubscriptionService.ProjectBuildRuleBlock => throw new NotImplementedException();
-
-            IProjectValueDataSource<IProjectSubscriptionUpdate> IProjectSubscriptionService.ProjectBuildRuleSource => throw new NotImplementedException();
-
-            ISourceBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> IProjectSubscriptionService.JointRuleBlock => JointRuleBlock;
-
-            IProjectValueDataSource<IProjectSubscriptionUpdate> IProjectSubscriptionService.JointRuleSource => JointRuleSource;
-
-            IReceivableSourceBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> IProjectSubscriptionService.SourceItemsRuleBlock => throw new NotImplementedException();
-
-            IProjectValueDataSource<IProjectSubscriptionUpdate> IProjectSubscriptionService.SourceItemsRuleSource => throw new NotImplementedException();
-
-            IReceivableSourceBlock<IProjectVersionedValue<IImmutableSet<string>>> IProjectSubscriptionService.SourceItemRuleNamesBlock => throw new NotImplementedException();
-
-            IProjectValueDataSource<IImmutableSet<string>> IProjectSubscriptionService.SourceItemRuleNamesSource => throw new NotImplementedException();
-        }
-
-        public class TestProjectValueDataSource<T> : IProjectValueDataSource<T>
-        {
-            public TestProjectValueDataSource(BufferBlock<IProjectVersionedValue<T>> sourceBlock)
-            {
-                SourceBlock = sourceBlock;
-            }
-
-            public BufferBlock<IProjectVersionedValue<T>> SourceBlock { get; }
-
-            IReceivableSourceBlock<IProjectVersionedValue<T>> IProjectValueDataSource<T>.SourceBlock => SourceBlock;
-
-            ISourceBlock<IProjectVersionedValue<object>> IProjectValueDataSource.SourceBlock => throw new NotImplementedException();
-
-            NamedIdentity IProjectValueDataSource.DataSourceKey => throw new NotImplementedException();
-
-            IComparable IProjectValueDataSource.DataSourceVersion => throw new NotImplementedException();
-
-            IDisposable IJoinableProjectValueDataSource.Join()
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        public class TestPropertyPagesCatalog : IPropertyPagesCatalog
-        {
-            private readonly Dictionary<string, IRule> _data;
-
-            public TestPropertyPagesCatalog(TestPropertyData[] data)
-            {
-                _data = new Dictionary<string, IRule>();
-                foreach (var category in data.GroupBy(p => p.Category))
-                {
-                    _data.Add(
-                        category.Key,
-                        CreateRule(category.Select(property => CreateProperty(property.PropertyName, property.Value, property.SetValues))));
-                }
-            }
-
-            private static IRule CreateRule(IEnumerable<IProperty> properties)
-            {
-                var rule = new Mock<IRule>();
-                rule
-                    .Setup(o => o.GetProperty(It.IsAny<string>()))
-                    .Returns((string propertyName) =>
-                    {
-
-                        return properties.FirstOrDefault(p => p.Name == propertyName);
-                    });
-
-                return rule.Object;
-            }
-
-            private static IProperty CreateProperty(string name, object value, List<object> setValues = null)
-            {
-                var property = new Mock<IProperty>();
-                property.SetupGet(o => o.Name)
-                        .Returns(name);
-
-                property.Setup(o => o.GetValueAsync())
-                        .ReturnsAsync(value);
-
-                property.As<IEvaluatedProperty>().Setup(p => p.GetEvaluatedValueAtEndAsync()).ReturnsAsync(value.ToString());
-                property.As<IEvaluatedProperty>().Setup(p => p.GetEvaluatedValueAsync()).ReturnsAsync(value.ToString());
-
-                if (setValues != null)
-                {
-                    property
-                        .Setup(p => p.SetValueAsync(It.IsAny<object>()))
-                        .Callback<object>(obj => setValues.Add(obj))
-                        .Returns(() => Task.CompletedTask);
-                }
-
-                return property.Object;
-            }
-
-            IRule IPropertyPagesCatalog.BindToContext(string schemaName, string file, string itemType, string itemName)
-            {
-                _data.TryGetValue(schemaName, out var value);
-                return value;
-            }
-
-            IRule IPropertyPagesCatalog.BindToContext(string schemaName, IProjectPropertiesContext context)
-            {
-                throw new NotImplementedException();
-            }
-
-            IRule IPropertyPagesCatalog.BindToContext(string schemaName, ProjectInstance projectInstance, string itemType, string itemName)
-            {
-                throw new NotImplementedException();
-            }
-
-            IRule IPropertyPagesCatalog.BindToContext(string schemaName, ProjectInstance projectInstance, ITaskItem taskItem)
-            {
-                throw new NotImplementedException();
-            }
-
-            IReadOnlyCollection<string> IPropertyPagesCatalog.GetProjectLevelPropertyPagesSchemas()
-            {
-                throw new NotImplementedException();
-            }
-
-            IReadOnlyCollection<string> IPropertyPagesCatalog.GetPropertyPagesSchemas()
-            {
-                throw new NotImplementedException();
-            }
-
-            IReadOnlyCollection<string> IPropertyPagesCatalog.GetPropertyPagesSchemas(string itemType)
-            {
-                throw new NotImplementedException();
-            }
-
-            IReadOnlyCollection<string> IPropertyPagesCatalog.GetPropertyPagesSchemas(IEnumerable<string> paths)
-            {
-                throw new NotImplementedException();
-            }
-
-            Rule IPropertyPagesCatalog.GetSchema(string schemaName)
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        public class TestAssemblyReferencesService : IAssemblyReferencesService
-        {
-            public TestAssemblyReferencesService()
-            {
-                ResolvedReferences = new List<IAssemblyReference>();
-            }
-
-            public List<IAssemblyReference> ResolvedReferences { get; }
-
-            Task<AddReferenceResult<IUnresolvedAssemblyReference>> IAssemblyReferencesService.AddAsync(AssemblyName assemblyName, string assemblyPath)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task<bool> IAssemblyReferencesService.CanResolveAsync(AssemblyName assemblyName, string assemblyPath)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task<bool> IAssemblyReferencesService.ContainsAsync(AssemblyName assemblyName, string assemblyPath)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task<IAssemblyReference> IAssemblyReferencesService.GetResolvedReferenceAsync(AssemblyName assemblyName, string assemblyPath)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task<IAssemblyReference> IResolvableReferencesService<IUnresolvedAssemblyReference, IAssemblyReference>.GetResolvedReferenceAsync(IUnresolvedAssemblyReference unresolvedReference)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task<IImmutableSet<IAssemblyReference>> IResolvableReferencesService<IUnresolvedAssemblyReference, IAssemblyReference>.GetResolvedReferencesAsync()
-            {
-                return Task.FromResult<IImmutableSet<IAssemblyReference>>(ResolvedReferences.ToImmutableHashSet());
-            }
-
-            Task<IUnresolvedAssemblyReference> IAssemblyReferencesService.GetUnresolvedReferenceAsync(AssemblyName assemblyName, string assemblyPath)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task<IUnresolvedAssemblyReference> IResolvableReferencesService<IUnresolvedAssemblyReference, IAssemblyReference>.GetUnresolvedReferenceAsync(IAssemblyReference resolvedReference)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task<IImmutableSet<IUnresolvedAssemblyReference>> IResolvableReferencesService<IUnresolvedAssemblyReference, IAssemblyReference>.GetUnresolvedReferencesAsync()
-            {
-                throw new NotImplementedException();
-            }
-
-            Task IAssemblyReferencesService.RemoveAsync(AssemblyName assemblyName, string assemblyPath)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task IResolvableReferencesService<IUnresolvedAssemblyReference, IAssemblyReference>.RemoveAsync(IUnresolvedAssemblyReference reference)
-            {
-                throw new NotImplementedException();
-            }
-
-            Task IResolvableReferencesService<IUnresolvedAssemblyReference, IAssemblyReference>.RemoveAsync(IEnumerable<IUnresolvedAssemblyReference> references)
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        public class TestProjectAsynchronousTasksService : IProjectAsynchronousTasksService, IProjectContext
-        {
-            public CancellationToken UnloadCancellationToken => CancellationToken.None;
-
-            public TestProjectAsynchronousTasksService(
-                IProjectService projectService,
-                UnconfiguredProject unconfiguredProject,
-                ConfiguredProject configuredProject)
-            {
-                ProjectService = projectService;
-                UnconfiguredProject = unconfiguredProject;
-                ConfiguredProject = configuredProject;
-            }
-
-            public IProjectService ProjectService { get; }
-
-            public UnconfiguredProject UnconfiguredProject { get; }
-
-            public ConfiguredProject ConfiguredProject { get; }
-
-            public Task DrainCriticalTaskQueueAsync(bool drainCurrentQueueOnly = false, bool throwExceptions = false, CancellationToken cancellationToken = default)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task DrainTaskQueueAsync(bool drainCurrentQueueOnly = false, bool throwExceptions = false, CancellationToken cancellationToken = default)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task DrainTaskQueueAsync(ProjectCriticalOperation operation, bool drainCurrentQueueOnly = false, bool throwExceptions = false, CancellationToken cancellationToken = default)
-            {
-                throw new NotImplementedException();
-            }
-
-            public bool IsTaskQueueEmpty(ProjectCriticalOperation projectCriticalOperation)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RegisterAsyncTask(JoinableTask joinableTask, bool registerFaultHandler = false)
-            {
-            }
-
-            public void RegisterAsyncTask(Task task, bool registerFaultHandler = false)
-            {
-            }
-
-            public void RegisterAsyncTask(JoinableTask joinableTask, ProjectCriticalOperation operationFlags, bool registerFaultHandler = false)
-            {
-            }
-
-            public void RegisterCriticalAsyncTask(JoinableTask joinableTask, bool registerFaultHandler = false)
-            {
-            }
-        }
-
-        public class TestThreadingService : IProjectThreadingService
-        {
-            public TestThreadingService()
-            {
-                JoinableTaskContext = new JoinableTaskContextNode(new JoinableTaskContext());
-                JoinableTaskFactory = new JoinableTaskFactory(JoinableTaskContext.Context);
-            }
-
-            public JoinableTaskContextNode JoinableTaskContext { get; }
-
-            public JoinableTaskFactory JoinableTaskFactory { get; }
-
-            public bool IsOnMainThread => throw new NotImplementedException();
-
-            public void ExecuteSynchronously(Func<Task> asyncAction)
-            {
-                asyncAction().GetAwaiter().GetResult();
-            }
-
-            public T ExecuteSynchronously<T>(Func<Task<T>> asyncAction)
-            {
-                return asyncAction().GetAwaiter().GetResult();
-            }
-
-            public void Fork(
-                Func<Task> asyncAction,
-                JoinableTaskFactory factory = null,
-                UnconfiguredProject unconfiguredProject = null,
-                ConfiguredProject configuredProject = null,
-                ErrorReportSettings watsonReportSettings = null,
-                ProjectFaultSeverity faultSeverity = ProjectFaultSeverity.Recoverable,
-                ForkOptions options = ForkOptions.Default)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IDisposable SuppressProjectExecutionContext()
-            {
-                throw new NotImplementedException();
-            }
-
-            public void VerifyOnUIThread()
-            {
-                if (!JoinableTaskContext.IsOnMainThread)
-                {
-                    throw new InvalidOperationException("This isn't the main thread.");
-                }
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestPropertyData.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestPropertyData.cs
deleted file mode 100644
index c2b3fb24c56d..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestPropertyData.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    public class TestPropertyData
-    {
-        public string Category { get; set; }
-
-        public string PropertyName { get; set; }
-
-        public object Value { get; set; }
-
-        public List<object> SetValues { get; set; }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/WorkspaceProjectSnapshotChangeTriggerTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/WorkspaceProjectSnapshotChangeTriggerTest.cs
deleted file mode 100644
index f77a283b33d3..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/WorkspaceProjectSnapshotChangeTriggerTest.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Moq;
-using Xunit;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    public class WorkspaceProjectSnapshotChangeTriggerTest : ForegroundDispatcherTestBase
-    {
-        public WorkspaceProjectSnapshotChangeTriggerTest()
-        {
-            Workspace = TestWorkspace.Create();
-            EmptySolution = Workspace.CurrentSolution.GetIsolatedSolution();
-
-            var projectId1 = ProjectId.CreateNewId("One");
-            var projectId2 = ProjectId.CreateNewId("Two");
-            var projectId3 = ProjectId.CreateNewId("Three");
-
-            SolutionWithTwoProjects = Workspace.CurrentSolution
-                .AddProject(ProjectInfo.Create(
-                    projectId1,
-                    VersionStamp.Default,
-                    "One",
-                    "One",
-                    LanguageNames.CSharp,
-                    filePath: "One.csproj"))
-                .AddProject(ProjectInfo.Create(
-                    projectId2,
-                    VersionStamp.Default,
-                    "Two",
-                    "Two",
-                    LanguageNames.CSharp,
-                    filePath: "Two.csproj"));
-
-            SolutionWithOneProject = EmptySolution.GetIsolatedSolution()
-                .AddProject(ProjectInfo.Create(
-                    projectId3,
-                    VersionStamp.Default,
-                    "Three",
-                    "Three",
-                    LanguageNames.CSharp,
-                    filePath: "Three.csproj"));
-
-            ProjectNumberOne = SolutionWithTwoProjects.GetProject(projectId1);
-            ProjectNumberTwo = SolutionWithTwoProjects.GetProject(projectId2);
-            ProjectNumberThree = SolutionWithOneProject.GetProject(projectId3);
-
-            HostProjectOne = new HostProject("One.csproj", FallbackRazorConfiguration.MVC_1_1);
-            HostProjectTwo = new HostProject("Two.csproj", FallbackRazorConfiguration.MVC_1_1);
-            HostProjectThree = new HostProject("Three.csproj", FallbackRazorConfiguration.MVC_1_1);
-        }
-
-        private HostProject HostProjectOne { get; }
-
-        private HostProject HostProjectTwo { get; }
-
-        private HostProject HostProjectThree { get; }
-
-        private Solution EmptySolution { get; }
-
-        private Solution SolutionWithOneProject { get; }
-
-        private Solution SolutionWithTwoProjects { get; }
-
-        private Project ProjectNumberOne { get; }
-
-        private Project ProjectNumberTwo { get; }
-
-        private Project ProjectNumberThree { get; }
-
-        private Workspace Workspace { get; }
-
-        [ForegroundTheory]
-        [InlineData(WorkspaceChangeKind.SolutionAdded)]
-        [InlineData(WorkspaceChangeKind.SolutionChanged)]
-        [InlineData(WorkspaceChangeKind.SolutionCleared)]
-        [InlineData(WorkspaceChangeKind.SolutionReloaded)]
-        [InlineData(WorkspaceChangeKind.SolutionRemoved)]
-        public void WorkspaceChanged_SolutionEvents_AddsProjectsInSolution(WorkspaceChangeKind kind)
-        {
-            // Arrange
-            var trigger = new WorkspaceProjectSnapshotChangeTrigger();
-            var projectManager = new TestProjectSnapshotManager(new[] { trigger }, Workspace);
-            projectManager.HostProjectAdded(HostProjectOne);
-            projectManager.HostProjectAdded(HostProjectTwo);
-
-            var e = new WorkspaceChangeEventArgs(kind, oldSolution: EmptySolution, newSolution: SolutionWithTwoProjects);
-
-            // Act
-            trigger.Workspace_WorkspaceChanged(Workspace, e);
-
-            // Assert
-            Assert.Collection(
-                projectManager.Projects.OrderBy(p => p.WorkspaceProject.Name),
-                p => Assert.Equal(ProjectNumberOne.Id, p.WorkspaceProject.Id),
-                p => Assert.Equal(ProjectNumberTwo.Id, p.WorkspaceProject.Id));
-        }
-
-        [ForegroundTheory]
-        [InlineData(WorkspaceChangeKind.SolutionAdded)]
-        [InlineData(WorkspaceChangeKind.SolutionChanged)]
-        [InlineData(WorkspaceChangeKind.SolutionCleared)]
-        [InlineData(WorkspaceChangeKind.SolutionReloaded)]
-        [InlineData(WorkspaceChangeKind.SolutionRemoved)]
-        public void WorkspaceChanged_SolutionEvents_ClearsExistingProjects_AddsProjectsInSolution(WorkspaceChangeKind kind)
-        {
-            // Arrange
-            var trigger = new WorkspaceProjectSnapshotChangeTrigger();
-            var projectManager = new TestProjectSnapshotManager(new[] { trigger }, Workspace);
-            projectManager.HostProjectAdded(HostProjectOne);
-            projectManager.HostProjectAdded(HostProjectTwo);
-            projectManager.HostProjectAdded(HostProjectThree);
-
-            // Initialize with a project. This will get removed.
-            var e = new WorkspaceChangeEventArgs(WorkspaceChangeKind.SolutionAdded, oldSolution: EmptySolution, newSolution: SolutionWithOneProject);
-            trigger.Workspace_WorkspaceChanged(Workspace, e);
-
-            e = new WorkspaceChangeEventArgs(kind, oldSolution: SolutionWithOneProject, newSolution: SolutionWithTwoProjects);
-
-            // Act
-            trigger.Workspace_WorkspaceChanged(Workspace, e);
-
-            // Assert
-            Assert.Collection(
-                projectManager.Projects.OrderBy(p => p.WorkspaceProject?.Name),
-                p => Assert.Null(p.WorkspaceProject),
-                p => Assert.Equal(ProjectNumberOne.Id, p.WorkspaceProject.Id),
-                p => Assert.Equal(ProjectNumberTwo.Id, p.WorkspaceProject.Id));
-        }
-
-        [ForegroundTheory]
-        [InlineData(WorkspaceChangeKind.ProjectChanged)]
-        [InlineData(WorkspaceChangeKind.ProjectReloaded)]
-        public async Task WorkspaceChanged_ProjectChangeEvents_UpdatesProject_AfterDelay(WorkspaceChangeKind kind)
-        {
-            // Arrange
-            var trigger = new WorkspaceProjectSnapshotChangeTrigger()
-            {
-                ProjectChangeDelay = 50,
-            };
-
-            var projectManager = new TestProjectSnapshotManager(new[] { trigger }, Workspace);
-            projectManager.HostProjectAdded(HostProjectOne);
-            projectManager.HostProjectAdded(HostProjectTwo);
-
-            // Initialize with some projects.
-            var e = new WorkspaceChangeEventArgs(WorkspaceChangeKind.SolutionAdded, oldSolution: EmptySolution, newSolution: SolutionWithTwoProjects);
-            trigger.Workspace_WorkspaceChanged(Workspace, e);
-
-            var solution = SolutionWithTwoProjects.WithProjectAssemblyName(ProjectNumberOne.Id, "Changed");
-            e = new WorkspaceChangeEventArgs(kind, oldSolution: SolutionWithTwoProjects, newSolution: solution, projectId: ProjectNumberOne.Id);
-
-            // Act
-            trigger.Workspace_WorkspaceChanged(Workspace, e);
-
-            // Assert
-            //
-            // The change hasn't come through yet.
-            Assert.Equal("One", projectManager.Projects.Single().WorkspaceProject.AssemblyName);
-
-            await trigger._deferredUpdates.Single().Value;
-
-            Assert.Collection(
-                projectManager.Projects.OrderBy(p => p.WorkspaceProject.Name),
-                p =>
-                {
-                    Assert.Equal(ProjectNumberOne.Id, p.WorkspaceProject.Id);
-                    Assert.Equal("Changed", p.WorkspaceProject.AssemblyName);
-                },
-                p => Assert.Equal(ProjectNumberTwo.Id, p.WorkspaceProject.Id));
-        }
-
-        [ForegroundFact]
-        public void WorkspaceChanged_ProjectRemovedEvent_RemovesProject()
-        {
-            // Arrange
-            var trigger = new WorkspaceProjectSnapshotChangeTrigger();
-            var projectManager = new TestProjectSnapshotManager(new[] { trigger }, Workspace);
-            projectManager.HostProjectAdded(HostProjectOne);
-            projectManager.HostProjectAdded(HostProjectTwo);
-
-            // Initialize with some projects project.
-            var e = new WorkspaceChangeEventArgs(WorkspaceChangeKind.SolutionAdded, oldSolution: EmptySolution, newSolution: SolutionWithTwoProjects);
-            trigger.Workspace_WorkspaceChanged(Workspace, e);
-
-            var solution = SolutionWithTwoProjects.RemoveProject(ProjectNumberOne.Id);
-            e = new WorkspaceChangeEventArgs(WorkspaceChangeKind.ProjectRemoved, oldSolution: SolutionWithTwoProjects, newSolution: solution, projectId: ProjectNumberOne.Id);
-
-            // Act
-            trigger.Workspace_WorkspaceChanged(Workspace, e);
-
-            // Assert
-            Assert.Collection(
-                projectManager.Projects.OrderBy(p => p.WorkspaceProject?.Name),
-                p => Assert.Null(p.WorkspaceProject),
-                p => Assert.Equal(ProjectNumberTwo.Id, p.WorkspaceProject.Id));
-        }
-
-        [ForegroundFact]
-        public void WorkspaceChanged_ProjectAddedEvent_AddsProject()
-        {
-            // Arrange
-            var trigger = new WorkspaceProjectSnapshotChangeTrigger();
-            var projectManager = new TestProjectSnapshotManager(new[] { trigger }, Workspace);
-            projectManager.HostProjectAdded(HostProjectThree);
-
-            var solution = SolutionWithOneProject;
-            var e = new WorkspaceChangeEventArgs(WorkspaceChangeKind.ProjectAdded, oldSolution: EmptySolution, newSolution: solution, projectId: ProjectNumberThree.Id);
-
-            // Act
-            trigger.Workspace_WorkspaceChanged(Workspace, e);
-
-            // Assert
-            Assert.Collection(
-                projectManager.Projects.OrderBy(p => p.WorkspaceProject.Name),
-                p => Assert.Equal(ProjectNumberThree.Id, p.WorkspaceProject.Id));
-        }
-
-        private class TestProjectSnapshotManager : DefaultProjectSnapshotManager
-        {
-            public TestProjectSnapshotManager(IEnumerable<ProjectSnapshotChangeTrigger> triggers, Workspace workspace)
-                : base(Mock.Of<ForegroundDispatcher>(), Mock.Of<ErrorReporter>(), triggers, workspace)
-            {
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Serialization/ProjectSnapshotHandleSerializationTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Serialization/ProjectSnapshotHandleSerializationTest.cs
deleted file mode 100644
index 347c533f8aff..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Serialization/ProjectSnapshotHandleSerializationTest.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Newtonsoft.Json;
-using Xunit;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor.Serialization
-{
-    public class ProjectSnapshotHandleSerializationTest
-    {
-        public ProjectSnapshotHandleSerializationTest()
-        {
-            var converters = new JsonConverterCollection();
-            converters.RegisterRazorConverters();
-            Converters = converters.ToArray();
-        }
-
-        public JsonConverter[] Converters { get; }
-
-        [Fact]
-        public void ProjectSnapshotHandleJsonConverter_Serialization_CanKindaRoundTrip()
-        {
-            // Arrange
-            var snapshot = new ProjectSnapshotHandle(
-                "Test.csproj",
-                new ProjectSystemRazorConfiguration(
-                RazorLanguageVersion.Version_1_1,
-                    "Test",
-                    new[]
-                    {
-                        new ProjectSystemRazorExtension("Test-Extension1"),
-                        new ProjectSystemRazorExtension("Test-Extension2"),
-                    }),
-                ProjectId.CreateFromSerialized(Guid.NewGuid(), "Test"));
-
-            // Act
-            var json = JsonConvert.SerializeObject(snapshot, Converters);
-            var obj = JsonConvert.DeserializeObject<ProjectSnapshotHandle>(json, Converters);
-
-            // Assert
-            Assert.Equal(snapshot.FilePath, obj.FilePath);
-            Assert.Equal(snapshot.Configuration.ConfigurationName, obj.Configuration.ConfigurationName);
-            Assert.Collection(
-                snapshot.Configuration.Extensions, 
-                e => Assert.Equal("Test-Extension1", e.ExtensionName),
-                e => Assert.Equal("Test-Extension2", e.ExtensionName));
-            Assert.Equal(snapshot.Configuration.LanguageVersion, obj.Configuration.LanguageVersion);
-            Assert.Equal(snapshot.WorkspaceProjectId.Id, obj.WorkspaceProjectId.Id);
-        }
-
-        [Fact]
-        public void ProjectSnapshotHandleJsonConverter_SerializationWithNulls_CanKindaRoundTrip()
-        {
-            // Arrange
-            var snapshot = new ProjectSnapshotHandle("Test.csproj", null, null);
-
-            // Act
-            var json = JsonConvert.SerializeObject(snapshot, Converters);
-            var obj = JsonConvert.DeserializeObject<ProjectSnapshotHandle>(json, Converters);
-
-            // Assert
-            Assert.Equal(snapshot.FilePath, obj.FilePath);
-            Assert.Null(obj.Configuration);
-            Assert.Null(obj.WorkspaceProjectId);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Serialization/RazorConfigurationSerializationTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Serialization/RazorConfigurationSerializationTest.cs
deleted file mode 100644
index 2b084a85310d..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Serialization/RazorConfigurationSerializationTest.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Newtonsoft.Json;
-using Xunit;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor.Serialization
-{
-    public class RazorConfigurationSerializationTest
-    {
-        public RazorConfigurationSerializationTest()
-        {
-            var converters = new JsonConverterCollection();
-            converters.RegisterRazorConverters();
-            Converters = converters.ToArray();
-        }
-
-        public JsonConverter[] Converters { get; }
-
-        [Fact]
-        public void RazorConfigurationJsonConverter_Serialization_CanRoundTrip()
-        {
-            // Arrange
-            var configuration = new ProjectSystemRazorConfiguration(
-                RazorLanguageVersion.Version_1_1,
-                "Test",
-                new[]
-                {
-                    new ProjectSystemRazorExtension("Test-Extension1"),
-                    new ProjectSystemRazorExtension("Test-Extension2"),
-                });
-
-            // Act
-            var json = JsonConvert.SerializeObject(configuration, Converters);
-            var obj = JsonConvert.DeserializeObject<RazorConfiguration>(json, Converters);
-
-            // Assert
-            Assert.Equal(configuration.ConfigurationName, obj.ConfigurationName);
-            Assert.Collection(
-                configuration.Extensions, 
-                e => Assert.Equal("Test-Extension1", e.ExtensionName),
-                e => Assert.Equal("Test-Extension2", e.ExtensionName));
-            Assert.Equal(configuration.LanguageVersion, obj.LanguageVersion);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Serialization/RazorExtensionSerializationTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Serialization/RazorExtensionSerializationTest.cs
deleted file mode 100644
index 0f93fb5bd7c5..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Serialization/RazorExtensionSerializationTest.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Newtonsoft.Json;
-using Xunit;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor.Serialization
-{
-    public class RazorExtensionSerializationTest
-    {
-        public RazorExtensionSerializationTest()
-        {
-            var converters = new JsonConverterCollection();
-            converters.RegisterRazorConverters();
-            Converters = converters.ToArray();
-        }
-
-        public JsonConverter[] Converters { get; }
-
-        [Fact]
-        public void RazorExensionJsonConverter_Serialization_CanRoundTrip()
-        {
-            // Arrange
-            var extension = new ProjectSystemRazorExtension("Test");
-
-            // Act
-            var json = JsonConvert.SerializeObject(extension, Converters);
-            var obj = JsonConvert.DeserializeObject<RazorExtension>(json, Converters);
-
-            // Assert
-            Assert.Equal(extension.ExtensionName, obj.ExtensionName);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Serialization/TagHelperDescriptorSerializationTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Serialization/TagHelperDescriptorSerializationTest.cs
deleted file mode 100644
index fd4b9ba89422..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Serialization/TagHelperDescriptorSerializationTest.cs
+++ /dev/null
@@ -1,291 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Mvc.Razor.Extensions;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.VisualStudio.LanguageServices.Razor.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-using Xunit;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor
-{
-    public class TagHelperDescriptorSerializationTest
-    {
-        [Fact]
-        public void TagHelperDescriptor_CanReadCamelCasedData()
-        {
-            // Arrange
-            var expectedDescriptor = CreateTagHelperDescriptor(
-                kind: TagHelperConventions.DefaultKind,
-                tagName: "tag-name",
-                typeName: "type name",
-                assemblyName: "assembly name",
-                attributes: new Action<BoundAttributeDescriptorBuilder>[]
-                {
-                    builder => builder
-                        .Name("test-attribute")
-                        .PropertyName("TestAttribute")
-                        .TypeName("string"),
-                },
-                ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
-                {
-                    builder => builder
-                        .RequireAttributeDescriptor(attribute => attribute
-                            .Name("required-attribute-one")
-                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch))
-                        .RequireAttributeDescriptor(attribute => attribute
-                            .Name("required-attribute-two")
-                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
-                            .Value("something")
-                            .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch))
-                        .RequireParentTag("parent-name")
-                        .RequireTagStructure(TagStructure.WithoutEndTag),
-                },
-                configureAction: builder =>
-                {
-                    builder.AllowChildTag("allowed-child-one");
-                    builder.AddMetadata("foo", "bar");
-                });
-            var serializerSettings = new JsonSerializerSettings()
-            {
-                ContractResolver = new CamelCasePropertyNamesContractResolver(),
-                Converters = new List<JsonConverter>
-                {
-                    TagHelperDescriptorJsonConverter.Instance,
-                    RazorDiagnosticJsonConverter.Instance,
-                }
-            };
-            var serializedDescriptor = JsonConvert.SerializeObject(expectedDescriptor, serializerSettings);
-
-            // Act
-            var descriptor = JsonConvert.DeserializeObject<TagHelperDescriptor>(serializedDescriptor, TagHelperDescriptorJsonConverter.Instance, RazorDiagnosticJsonConverter.Instance);
-
-            // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
-        }
-
-        [Fact]
-        public void TagHelperDescriptor_RoundTripsProperly()
-        {
-            // Arrange
-            var expectedDescriptor = CreateTagHelperDescriptor(
-                kind: TagHelperConventions.DefaultKind,
-                tagName: "tag-name",
-                typeName: "type name",
-                assemblyName: "assembly name",
-                attributes: new Action<BoundAttributeDescriptorBuilder>[]
-                {
-                    builder => builder
-                        .Name("test-attribute")
-                        .PropertyName("TestAttribute")
-                        .TypeName("string"),
-                },
-                ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
-                {
-                    builder => builder
-                        .RequireAttributeDescriptor(attribute => attribute
-                            .Name("required-attribute-one")
-                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch))
-                        .RequireAttributeDescriptor(attribute => attribute
-                            .Name("required-attribute-two")
-                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
-                            .Value("something")
-                            .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch))
-                        .RequireParentTag("parent-name")
-                        .RequireTagStructure(TagStructure.WithoutEndTag),
-                },
-                configureAction: builder =>
-                {
-                    builder.AllowChildTag("allowed-child-one");
-                    builder.AddMetadata("foo", "bar");
-                });
-
-            // Act
-            var serializedDescriptor = JsonConvert.SerializeObject(expectedDescriptor, TagHelperDescriptorJsonConverter.Instance, RazorDiagnosticJsonConverter.Instance);
-            var descriptor = JsonConvert.DeserializeObject<TagHelperDescriptor>(serializedDescriptor, TagHelperDescriptorJsonConverter.Instance, RazorDiagnosticJsonConverter.Instance);
-
-            // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
-        }
-
-        [Fact]
-        public void ViewComponentTagHelperDescriptor_RoundTripsProperly()
-        {
-            // Arrange
-            var expectedDescriptor = CreateTagHelperDescriptor(
-                kind: ViewComponentTagHelperConventions.Kind,
-                tagName: "tag-name",
-                typeName: "type name",
-                assemblyName: "assembly name",
-                attributes: new Action<BoundAttributeDescriptorBuilder>[]
-                {
-                    builder => builder
-                        .Name("test-attribute")
-                        .PropertyName("TestAttribute")
-                        .TypeName("string"),
-                },
-                ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
-                {
-                    builder => builder
-                        .RequireAttributeDescriptor(attribute => attribute
-                            .Name("required-attribute-one")
-                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch))
-                        .RequireAttributeDescriptor(attribute => attribute
-                            .Name("required-attribute-two")
-                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
-                            .Value("something")
-                            .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch))
-                        .RequireParentTag("parent-name")
-                        .RequireTagStructure(TagStructure.WithoutEndTag),
-                },
-                configureAction: builder =>
-                {
-                    builder.AllowChildTag("allowed-child-one");
-                    builder.AddMetadata("foo", "bar");
-                });
-
-            // Act
-            var serializedDescriptor = JsonConvert.SerializeObject(expectedDescriptor, TagHelperDescriptorJsonConverter.Instance, RazorDiagnosticJsonConverter.Instance);
-            var descriptor = JsonConvert.DeserializeObject<TagHelperDescriptor>(serializedDescriptor, TagHelperDescriptorJsonConverter.Instance, RazorDiagnosticJsonConverter.Instance);
-
-            // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
-        }
-
-        [Fact]
-        public void TagHelperDescriptor_WithDiagnostic_RoundTripsProperly()
-        {
-            // Arrange
-            var expectedDescriptor = CreateTagHelperDescriptor(
-                kind: TagHelperConventions.DefaultKind,
-                tagName: "tag-name",
-                typeName: "type name",
-                assemblyName: "assembly name",
-                attributes: new Action<BoundAttributeDescriptorBuilder>[]
-                {
-                    builder => builder
-                        .Name("test-attribute")
-                        .PropertyName("TestAttribute")
-                        .TypeName("string"),
-                },
-                ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
-                {
-                    builder => builder
-                        .RequireAttributeDescriptor(attribute => attribute
-                            .Name("required-attribute-one")
-                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch))
-                        .RequireAttributeDescriptor(attribute => attribute
-                            .Name("required-attribute-two")
-                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
-                            .Value("something")
-                            .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch))
-                        .RequireParentTag("parent-name"),
-                },
-                configureAction: builder =>
-                {
-                    builder.AllowChildTag("allowed-child-one")
-                        .AddMetadata("foo", "bar")
-                        .AddDiagnostic(RazorDiagnostic.Create(
-                            new RazorDiagnosticDescriptor("id", () => "Test Message", RazorDiagnosticSeverity.Error), new SourceSpan(null, 10, 20, 30, 40)));
-                });
-
-            // Act
-            var serializedDescriptor = JsonConvert.SerializeObject(expectedDescriptor, TagHelperDescriptorJsonConverter.Instance, RazorDiagnosticJsonConverter.Instance);
-            var descriptor = JsonConvert.DeserializeObject<TagHelperDescriptor>(serializedDescriptor, TagHelperDescriptorJsonConverter.Instance, RazorDiagnosticJsonConverter.Instance);
-
-            // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
-        }
-
-        [Fact]
-        public void TagHelperDescriptor_WithIndexerAttributes_RoundTripsProperly()
-        {
-            // Arrange
-            var expectedDescriptor = CreateTagHelperDescriptor(
-                kind: TagHelperConventions.DefaultKind,
-                tagName: "tag-name",
-                typeName: "type name",
-                assemblyName: "assembly name",
-                attributes: new Action<BoundAttributeDescriptorBuilder>[]
-                {
-                    builder => builder
-                        .Name("test-attribute")
-                        .PropertyName("TestAttribute")
-                        .TypeName("SomeEnum")
-                        .AsEnum()
-                        .Documentation("Summary"),
-                    builder => builder
-                        .Name("test-attribute2")
-                        .PropertyName("TestAttribute2")
-                        .TypeName("SomeDictionary")
-                        .AsDictionaryAttribute("dict-prefix-", "string"),
-                },
-                ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
-                {
-                    builder => builder
-                        .RequireAttributeDescriptor(attribute => attribute
-                            .Name("required-attribute-one")
-                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch))
-                },
-                configureAction: builder =>
-                {
-                    builder
-                        .AllowChildTag("allowed-child-one")
-                        .AddMetadata("foo", "bar")
-                        .TagOutputHint("Hint");
-                });
-
-            // Act
-            var serializedDescriptor = JsonConvert.SerializeObject(expectedDescriptor, TagHelperDescriptorJsonConverter.Instance, RazorDiagnosticJsonConverter.Instance);
-            var descriptor = JsonConvert.DeserializeObject<TagHelperDescriptor>(serializedDescriptor, TagHelperDescriptorJsonConverter.Instance, RazorDiagnosticJsonConverter.Instance);
-
-            // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
-        }
-
-        private static TagHelperDescriptor CreateTagHelperDescriptor(
-            string kind,
-            string tagName,
-            string typeName,
-            string assemblyName,
-            IEnumerable<Action<BoundAttributeDescriptorBuilder>> attributes = null,
-            IEnumerable<Action<TagMatchingRuleDescriptorBuilder>> ruleBuilders = null,
-            Action<TagHelperDescriptorBuilder> configureAction = null)
-        {
-            var builder = TagHelperDescriptorBuilder.Create(kind, typeName, assemblyName);
-            builder.SetTypeName(typeName);
-
-            if (attributes != null)
-            {
-                foreach (var attributeBuilder in attributes)
-                {
-                    builder.BoundAttributeDescriptor(attributeBuilder);
-                }
-            }
-
-            if (ruleBuilders != null)
-            {
-                foreach (var ruleBuilder in ruleBuilders)
-                {
-                    builder.TagMatchingRuleDescriptor(innerRuleBuilder => {
-                        innerRuleBuilder.RequireTagName(tagName);
-                        ruleBuilder(innerRuleBuilder);
-                    });
-                }
-            }
-            else
-            {
-                builder.TagMatchingRuleDescriptor(ruleBuilder => ruleBuilder.RequireTagName(tagName));
-            }
-
-            configureAction?.Invoke(builder);
-
-            var descriptor = builder.Build();
-
-            return descriptor;
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/VsSolutionUpdatesProjectSnapshotChangeTriggerTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/VsSolutionUpdatesProjectSnapshotChangeTriggerTest.cs
deleted file mode 100644
index c5ce0778444e..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/VsSolutionUpdatesProjectSnapshotChangeTriggerTest.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Editor.Razor;
-using Microsoft.VisualStudio.Shell.Interop;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor
-{
-    public class VsSolutionUpdatesProjectSnapshotChangeTriggerTest
-    {
-        public VsSolutionUpdatesProjectSnapshotChangeTriggerTest()
-        {
-            SomeProject = new HostProject("c:\\SomeProject\\SomeProject.csproj", FallbackRazorConfiguration.MVC_1_0);
-            SomeOtherProject = new HostProject("c:\\SomeOtherProject\\SomeOtherProject.csproj", FallbackRazorConfiguration.MVC_2_0);
-
-            Workspace = TestWorkspace.Create(w =>
-            {
-                SomeWorkspaceProject = w.AddProject(ProjectInfo.Create(
-                    ProjectId.CreateNewId(),
-                    VersionStamp.Create(),
-                    "SomeProject",
-                    "SomeProject",
-                    LanguageNames.CSharp,
-                    filePath: SomeProject.FilePath));
-
-                SomeOtherWorkspaceProject = w.AddProject(ProjectInfo.Create(
-                    ProjectId.CreateNewId(),
-                    VersionStamp.Create(),
-                    "SomeOtherProject",
-                    "SomeOtherProject",
-                    LanguageNames.CSharp,
-                    filePath: SomeOtherProject.FilePath));
-            });
-        }
-
-        private HostProject SomeProject { get; }
-
-        private HostProject SomeOtherProject { get; }
-
-        private Project SomeWorkspaceProject { get; set; }
-
-        private Project SomeOtherWorkspaceProject { get; set; }
-
-        private Workspace Workspace { get; }
-
-        [Fact]
-        public void Initialize_AttachesEventSink()
-        {
-            // Arrange
-            uint cookie;
-            var buildManager = new Mock<IVsSolutionBuildManager>(MockBehavior.Strict);
-            buildManager
-                .Setup(b => b.AdviseUpdateSolutionEvents(It.IsAny<VsSolutionUpdatesProjectSnapshotChangeTrigger>(), out cookie))
-                .Returns(VSConstants.S_OK)
-                .Verifiable();
-
-            var services = new Mock<IServiceProvider>();
-            services.Setup(s => s.GetService(It.Is<Type>(f => f == typeof(SVsSolutionBuildManager)))).Returns(buildManager.Object);
-
-            var trigger = new VsSolutionUpdatesProjectSnapshotChangeTrigger(services.Object, Mock.Of<TextBufferProjectService>());
-
-            // Act
-            trigger.Initialize(Mock.Of<ProjectSnapshotManagerBase>());
-
-            // Assert
-            buildManager.Verify();
-        }
-
-        [Fact]
-        public void UpdateProjectCfg_Done_KnownProject_Invokes_WorkspaceProjectChanged()
-        {
-            // Arrange
-            var expectedProjectPath = SomeProject.FilePath;
-
-            uint cookie;
-            var buildManager = new Mock<IVsSolutionBuildManager>(MockBehavior.Strict);
-            buildManager
-                .Setup(b => b.AdviseUpdateSolutionEvents(It.IsAny<VsSolutionUpdatesProjectSnapshotChangeTrigger>(), out cookie))
-                .Returns(VSConstants.S_OK);
-
-            var services = new Mock<IServiceProvider>();
-            services.Setup(s => s.GetService(It.Is<Type>(f => f == typeof(SVsSolutionBuildManager)))).Returns(buildManager.Object);
-
-            var projectService = new Mock<TextBufferProjectService>();
-            projectService.Setup(p => p.GetProjectPath(It.IsAny<IVsHierarchy>())).Returns(expectedProjectPath);
-
-            var projectSnapshots = new[]
-            {
-                new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, SomeProject, SomeWorkspaceProject)),
-                new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, SomeOtherProject, SomeOtherWorkspaceProject)),
-            };
-
-            var called = false;
-            var projectManager = new Mock<ProjectSnapshotManagerBase>();
-            projectManager.SetupGet(p => p.Workspace).Returns(Workspace);
-            projectManager
-                .Setup(p => p.GetLoadedProject(expectedProjectPath))
-                .Returns(projectSnapshots[0]);
-            projectManager
-                .Setup(p => p.WorkspaceProjectChanged(It.IsAny<Project>()))
-                .Callback<Project>(c =>
-                {
-                    called = true;
-                    Assert.Equal(expectedProjectPath, c.FilePath);
-                });
-
-            var trigger = new VsSolutionUpdatesProjectSnapshotChangeTrigger(services.Object, projectService.Object);
-            trigger.Initialize(projectManager.Object);
-
-            // Act
-            trigger.UpdateProjectCfg_Done(Mock.Of<IVsHierarchy>(), Mock.Of<IVsCfg>(), Mock.Of<IVsCfg>(), 0, 0, 0);
-
-            // Assert
-            Assert.True(called);
-        }
-
-        [Fact]
-        public void UpdateProjectCfg_Done_WithoutWorkspaceProject_DoesNotInvoke_WorkspaceProjectChanged()
-        {
-            // Arrange
-            var expectedProjectPath = SomeProject.FilePath;
-
-            uint cookie;
-            var buildManager = new Mock<IVsSolutionBuildManager>(MockBehavior.Strict);
-            buildManager
-                .Setup(b => b.AdviseUpdateSolutionEvents(It.IsAny<VsSolutionUpdatesProjectSnapshotChangeTrigger>(), out cookie))
-                .Returns(VSConstants.S_OK);
-
-            var services = new Mock<IServiceProvider>();
-            services.Setup(s => s.GetService(It.Is<Type>(f => f == typeof(SVsSolutionBuildManager)))).Returns(buildManager.Object);
-
-            var projectService = new Mock<TextBufferProjectService>();
-            projectService.Setup(p => p.GetProjectPath(It.IsAny<IVsHierarchy>())).Returns(expectedProjectPath);
-
-            var projectSnapshots = new[]
-            {
-                new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, SomeProject, null)),
-                new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, SomeOtherProject, SomeOtherWorkspaceProject)),
-            };
-
-            var projectManager = new Mock<ProjectSnapshotManagerBase>();
-            projectManager.SetupGet(p => p.Workspace).Returns(Workspace);
-            projectManager
-                .Setup(p => p.GetLoadedProject(expectedProjectPath))
-                .Returns(projectSnapshots[0]);
-            projectManager
-                .Setup(p => p.WorkspaceProjectChanged(It.IsAny<Project>()))
-                .Callback<Project>(c =>
-                {
-                    throw new InvalidOperationException("This should not be called.");
-                });
-
-            var trigger = new VsSolutionUpdatesProjectSnapshotChangeTrigger(services.Object, projectService.Object);
-            trigger.Initialize(projectManager.Object);
-
-            // Act & Assert - Does not throw
-            trigger.UpdateProjectCfg_Done(Mock.Of<IVsHierarchy>(), Mock.Of<IVsCfg>(), Mock.Of<IVsCfg>(), 0, 0, 0);
-        }
-
-        [Fact]
-        public void UpdateProjectCfg_Done_UnknownProject_DoesNotInvoke_WorkspaceProjectChanged()
-        {
-            // Arrange
-            var expectedProjectPath = "Path/To/Project";
-
-            uint cookie;
-            var buildManager = new Mock<IVsSolutionBuildManager>(MockBehavior.Strict);
-            buildManager
-                .Setup(b => b.AdviseUpdateSolutionEvents(It.IsAny<VsSolutionUpdatesProjectSnapshotChangeTrigger>(), out cookie))
-                .Returns(VSConstants.S_OK);
-
-            var services = new Mock<IServiceProvider>();
-            services.Setup(s => s.GetService(It.Is<Type>(f => f == typeof(SVsSolutionBuildManager)))).Returns(buildManager.Object);
-
-            var projectService = new Mock<TextBufferProjectService>();
-            projectService.Setup(p => p.GetProjectPath(It.IsAny<IVsHierarchy>())).Returns(expectedProjectPath);
-
-            var projectSnapshots = new[]
-            {
-                new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, SomeProject, SomeWorkspaceProject)),
-                new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, SomeOtherProject, SomeOtherWorkspaceProject)),
-            };
-
-            var projectManager = new Mock<ProjectSnapshotManagerBase>();
-            projectManager.SetupGet(p => p.Workspace).Returns(Workspace);
-            projectManager
-                .Setup(p => p.GetLoadedProject(expectedProjectPath))
-                .Returns((ProjectSnapshot)null);
-            projectManager
-                .Setup(p => p.WorkspaceProjectChanged(It.IsAny<Project>()))
-                .Callback<Project>(c =>
-                {
-                    throw new InvalidOperationException("This should not be called.");
-                });
-
-            var trigger = new VsSolutionUpdatesProjectSnapshotChangeTrigger(services.Object, projectService.Object);
-            trigger.Initialize(projectManager.Object);
-
-            // Act & Assert - Does not throw
-            trigger.UpdateProjectCfg_Done(Mock.Of<IVsHierarchy>(), Mock.Of<IVsCfg>(), Mock.Of<IVsCfg>(), 0, 0, 0);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/xunit.runner.json b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/xunit.runner.json
deleted file mode 100644
index c04bb61fe68c..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/xunit.runner.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "methodDisplay": "method",
-  "shadowCopy": false
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/DefaultDotNetProjectHostTest.cs b/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/DefaultDotNetProjectHostTest.cs
deleted file mode 100644
index b2a55f7cf43f..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/DefaultDotNetProjectHostTest.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.VisualStudio.Editor.Razor;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor.ProjectSystem
-{
-    public class DefaultDotNetProjectHostTest : ForegroundDispatcherTestBase
-    {
-        [Fact]
-        public void UpdateRazorHostProject_UnsupportedProjectNoops()
-        {
-            // Arrange
-            var projectService = new Mock<TextBufferProjectService>();
-            projectService.Setup(p => p.IsSupportedProject(It.IsAny<object>()))
-                .Returns(false);
-            var dotNetProjectHost = new DefaultDotNetProjectHost(
-                Dispatcher,
-                Mock.Of<VisualStudioMacWorkspaceAccessor>(),
-                projectService.Object);
-
-            // Act & Assert
-            dotNetProjectHost.UpdateRazorHostProject();
-        }
-
-        // -------------------------------------------------------------------------------------------
-        // Purposefully do not have any more tests here because that would involve mocking MonoDevelop 
-        // types. The default constructors for the Solution / DotNetProject MonoDevelop types change
-        // static classes (they assume they're being created in an IDE).
-        // -------------------------------------------------------------------------------------------
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/DefaultRazorProjectHostTest.cs b/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/DefaultRazorProjectHostTest.cs
deleted file mode 100644
index 4a02ccad178e..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/DefaultRazorProjectHostTest.cs
+++ /dev/null
@@ -1,470 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using MonoDevelop.Projects.MSBuild;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor.ProjectSystem
-{
-    public class DefaultRazorProjectHostTest
-    {
-        [Fact]
-        public void TryGetDefaultConfiguration_FailsIfNoConfiguration()
-        {
-            // Arrange
-            var projectProperties = new MSBuildPropertyGroup();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetDefaultConfiguration(projectProperties, out var defaultConfiguration);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(defaultConfiguration);
-        }
-
-        [Fact]
-        public void TryGetDefaultConfiguration_FailsIfEmptyConfiguration()
-        {
-            // Arrange
-            var projectProperties = new MSBuildPropertyGroup();
-            projectProperties.SetValue("RazorDefaultConfiguration", string.Empty);
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetDefaultConfiguration(projectProperties, out var defaultConfiguration);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(defaultConfiguration);
-        }
-
-        [Fact]
-        public void TryGetDefaultConfiguration_SucceedsWithValidConfiguration()
-        {
-            // Arrange
-            var expectedConfiguration = "Razor-13.37";
-            var projectProperties = new MSBuildPropertyGroup();
-            projectProperties.SetValue("RazorDefaultConfiguration", expectedConfiguration);
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetDefaultConfiguration(projectProperties, out var defaultConfiguration);
-
-            // Assert
-            Assert.True(result);
-            Assert.Equal(expectedConfiguration, defaultConfiguration);
-        }
-
-        [Fact]
-        public void TryGetLanguageVersion_FailsIfNoLanguageVersion()
-        {
-            // Arrange
-            var projectProperties = new MSBuildPropertyGroup();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetLanguageVersion(projectProperties, out var languageVersion);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(languageVersion);
-        }
-
-        [Fact]
-        public void TryGetLanguageVersion_FailsIfEmptyLanguageVersion()
-        {
-            // Arrange
-            var projectProperties = new MSBuildPropertyGroup();
-            projectProperties.SetValue("RazorLangVersion", string.Empty);
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetLanguageVersion(projectProperties, out var languageVersion);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(languageVersion);
-        }
-
-        [Fact]
-        public void TryGetLanguageVersion_SucceedsWithValidLanguageVersion()
-        {
-            // Arrange
-            var projectProperties = new MSBuildPropertyGroup();
-            projectProperties.SetValue("RazorLangVersion", "1.0");
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetLanguageVersion(projectProperties, out var languageVersion);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(RazorLanguageVersion.Version_1_0, languageVersion);
-        }
-
-        [Fact]
-        public void TryGetLanguageVersion_SucceedsWithUnknownLanguageVersion_DefaultsToLatest()
-        {
-            // Arrange
-            var projectProperties = new MSBuildPropertyGroup();
-            projectProperties.SetValue("RazorLangVersion", "13.37");
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetLanguageVersion(projectProperties, out var languageVersion);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(RazorLanguageVersion.Latest, languageVersion);
-        }
-
-        [Fact]
-        public void TryGetConfigurationItem_FailsNoRazorConfigurationItems()
-        {
-            // Arrange
-            var projectItems = Enumerable.Empty<IMSBuildItemEvaluated>();
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfigurationItem("Razor-13.37", projectItems, out var configurationItem);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configurationItem);
-        }
-
-        [Fact]
-        public void TryGetConfigurationItem_FailsNoMatchingRazorConfigurationItems()
-        {
-            // Arrange
-            var projectItems = new IMSBuildItemEvaluated[]
-            {
-                new TestMSBuildItem("RazorConfiguration")
-                {
-                    Include = "Razor-10.0",
-                }
-            };
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfigurationItem("Razor-13.37", projectItems, out var configurationItem);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configurationItem);
-        }
-
-        [Fact]
-        public void TryGetConfigurationItem_SucceedsForMatchingConfigurationItem()
-        {
-            // Arrange
-            var expectedConfiguration = "Razor-13.37";
-            var expectedConfigurationItem = new TestMSBuildItem("RazorConfiguration")
-            {
-                Include = expectedConfiguration,
-            };
-            var projectItems = new IMSBuildItemEvaluated[]
-            {
-                new TestMSBuildItem("RazorConfiguration")
-                {
-                    Include = "Razor-10.0-DoesNotMatch",
-                },
-                expectedConfigurationItem
-            };
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfigurationItem(expectedConfiguration, projectItems, out var configurationItem);
-
-            // Assert
-            Assert.True(result);
-            Assert.Same(expectedConfigurationItem, configurationItem);
-        }
-
-        [Fact]
-        public void TryGetConfiguredExtensionNames_FailsIfNoExtensions()
-        {
-            // Arrange
-            var configurationItem = new TestMSBuildItem("RazorConfiguration");
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguredExtensionNames(configurationItem, out var configuredExtensionnames);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configuredExtensionnames);
-        }
-
-        [Fact]
-        public void TryGetConfiguredExtensionNames_FailsIfEmptyExtensions()
-        {
-            // Arrange
-            var configurationItem = new TestMSBuildItem("RazorConfiguration");
-            configurationItem.TestMetadata.SetValue("Extensions", string.Empty);
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguredExtensionNames(configurationItem, out var configuredExtensionNames);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configuredExtensionNames);
-        }
-
-        [Fact]
-        public void TryGetConfiguredExtensionNames_SucceedsIfSingleExtension()
-        {
-            // Arrange
-            var expectedExtensionName = "SomeExtensionName";
-            var configurationItem = new TestMSBuildItem("RazorConfiguration");
-            configurationItem.TestMetadata.SetValue("Extensions", expectedExtensionName);
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguredExtensionNames(configurationItem, out var configuredExtensionNames);
-
-            // Assert
-            Assert.True(result);
-            var extensionName = Assert.Single(configuredExtensionNames);
-            Assert.Equal(expectedExtensionName, extensionName);
-        }
-
-        [Fact]
-        public void TryGetConfiguredExtensionNames_SucceedsIfMultipleExtensions()
-        {
-            // Arrange
-            var configurationItem = new TestMSBuildItem("RazorConfiguration");
-            configurationItem.TestMetadata.SetValue("Extensions", "SomeExtensionName;SomeOtherExtensionName");
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguredExtensionNames(configurationItem, out var configuredExtensionNames);
-
-            // Assert
-            Assert.True(result);
-            Assert.Collection(
-                configuredExtensionNames,
-                name => Assert.Equal("SomeExtensionName", name),
-                name => Assert.Equal("SomeOtherExtensionName", name));
-        }
-
-        [Fact]
-        public void GetExtensions_NoExtensionTypes_ReturnsEmptyArray()
-        {
-            // Arrange
-            var projectItems = new IMSBuildItemEvaluated[]
-            {
-                new TestMSBuildItem("NotAnExtension")
-                {
-                    Include = "Extension1",
-                },
-            };
-
-            // Act
-            var extensions = DefaultRazorProjectHost.GetExtensions(new[] { "Extension1", "Extension2" }, projectItems);
-
-            // Assert
-            Assert.Empty(extensions);
-        }
-
-        [Fact]
-        public void GetExtensions_UnConfiguredExtensionTypes_ReturnsEmptyArray()
-        {
-            // Arrange
-            var projectItems = new IMSBuildItemEvaluated[]
-            {
-                new TestMSBuildItem("RazorExtension")
-                {
-                    Include = "UnconfiguredExtensionName",
-                },
-            };
-
-            // Act
-            var extensions = DefaultRazorProjectHost.GetExtensions(new[] { "Extension1", "Extension2" }, projectItems);
-
-            // Assert
-            Assert.Empty(extensions);
-        }
-
-        [Fact]
-        public void GetExtensions_SomeConfiguredExtensions_ReturnsConfiguredExtensions()
-        {
-            // Arrange
-            var expectedExtension1Name = "Extension1";
-            var expectedExtension2Name = "Extension2";
-            var projectItems = new IMSBuildItemEvaluated[]
-            {
-                new TestMSBuildItem("RazorExtension")
-                {
-                    Include = "UnconfiguredExtensionName",
-                },
-                new TestMSBuildItem("RazorExtension")
-                {
-                    Include = expectedExtension1Name,
-                },
-                new TestMSBuildItem("RazorExtension")
-                {
-                    Include = expectedExtension2Name,
-                },
-            };
-
-            // Act
-            var extensions = DefaultRazorProjectHost.GetExtensions(new[] { expectedExtension1Name, expectedExtension2Name }, projectItems);
-
-            // Assert
-            Assert.Collection(
-                extensions,
-                extension => Assert.Equal(expectedExtension1Name, extension.ExtensionName),
-                extension => Assert.Equal(expectedExtension2Name, extension.ExtensionName));
-        }
-
-        [Fact]
-        public void TryGetConfiguration_FailsIfNoDefaultConfiguration()
-        {
-            // Arrange
-            var projectProperties = new MSBuildPropertyGroup();
-            var projectItems = new IMSBuildItemEvaluated[0];
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguration(projectProperties, projectItems, out var configuration);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configuration);
-        }
-
-        [Fact]
-        public void TryGetConfiguration_FailsIfNoLanguageVersion()
-        {
-            // Arrange
-            var projectProperties = new MSBuildPropertyGroup();
-            projectProperties.SetValue("RazorDefaultConfiguration", "Razor-13.37");
-            var projectItems = new IMSBuildItemEvaluated[0];
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguration(projectProperties, projectItems, out var configuration);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configuration);
-        }
-
-        [Fact]
-        public void TryGetConfiguration_FailsIfNoConfigurationItems()
-        {
-            // Arrange
-            var projectProperties = new MSBuildPropertyGroup();
-            projectProperties.SetValue("RazorDefaultConfiguration", "Razor-13.37");
-            projectProperties.SetValue("RazorLangVersion", "1.0");
-            var projectItems = new IMSBuildItemEvaluated[0];
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguration(projectProperties, projectItems, out var configuration);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configuration);
-        }
-
-        [Fact]
-        public void TryGetConfiguration_FailsIfNoConfiguredExtensionNames()
-        {
-            // Arrange
-            var projectProperties = new MSBuildPropertyGroup();
-            projectProperties.SetValue("RazorDefaultConfiguration", "Razor-13.37");
-            projectProperties.SetValue("RazorLangVersion", "1.0");
-            var projectItems = new IMSBuildItemEvaluated[]
-            {
-                new TestMSBuildItem("RazorConfiguration")
-                {
-                    Include = "Razor-13.37",
-                },
-            };
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguration(projectProperties, projectItems, out var configuration);
-
-            // Assert
-            Assert.False(result);
-            Assert.Null(configuration);
-        }
-
-        // This is more of an integration test but is here to test the overall flow/functionality
-        [Fact]
-        public void TryGetConfiguration_SucceedsWithAllPreRequisites()
-        {
-            // Arrange
-            var expectedLanguageVersion = RazorLanguageVersion.Version_1_0;
-            var expectedConfigurationName = "Razor-Test";
-            var expectedExtension1Name = "Extension1";
-            var expectedExtension2Name = "Extension2";
-            var expectedRazorConfigurationItem = new TestMSBuildItem("RazorConfiguration")
-            {
-                Include = expectedConfigurationName,
-            };
-            expectedRazorConfigurationItem.TestMetadata.SetValue("Extensions", "Extension1;Extension2");
-            var projectItems = new IMSBuildItemEvaluated[]
-            {
-                new TestMSBuildItem("RazorConfiguration")
-                {
-                    Include = "UnconfiguredRazorConfiguration",
-                },
-                new TestMSBuildItem("RazorExtension")
-                {
-                    Include = "UnconfiguredExtensionName",
-                },
-                new TestMSBuildItem("RazorExtension")
-                {
-                    Include = expectedExtension1Name,
-                },
-                new TestMSBuildItem("RazorExtension")
-                {
-                    Include = expectedExtension2Name,
-                },
-                expectedRazorConfigurationItem,
-            };
-            var projectProperties = new MSBuildPropertyGroup();
-            projectProperties.SetValue("RazorDefaultConfiguration", expectedConfigurationName);
-            projectProperties.SetValue("RazorLangVersion", "1.0");
-
-            // Act
-            var result = DefaultRazorProjectHost.TryGetConfiguration(projectProperties, projectItems, out var configuration);
-
-            // Assert
-            Assert.True(result);
-            Assert.Equal(expectedLanguageVersion, configuration.LanguageVersion);
-            Assert.Equal(expectedConfigurationName, configuration.ConfigurationName);
-            Assert.Collection(
-                configuration.Extensions,
-                extension => Assert.Equal(expectedExtension1Name, extension.ExtensionName),
-                extension => Assert.Equal(expectedExtension2Name, extension.ExtensionName));
-        }
-
-        private class TestMSBuildItem : IMSBuildItemEvaluated
-        {
-            private readonly MSBuildPropertyGroup _metadata;
-            private readonly string _name;
-            private string _include;
-
-            public TestMSBuildItem(string name)
-            {
-                _name = name;
-                _metadata = new MSBuildPropertyGroup();
-            }
-
-            public string Name => _name;
-
-            public string Include
-            {
-                get => _include;
-                set => _include = value;
-            }
-
-            public MSBuildPropertyGroup TestMetadata => _metadata;
-
-            public IMSBuildPropertyGroupEvaluated Metadata => _metadata;
-
-            public string Condition => throw new System.NotImplementedException();
-
-            public bool IsImported => throw new System.NotImplementedException();
-
-
-            public string UnevaluatedInclude => throw new System.NotImplementedException();
-
-            public MSBuildItem SourceItem => throw new System.NotImplementedException();
-
-            public IEnumerable<MSBuildItem> SourceItems => throw new System.NotImplementedException();
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/DefaultVisualStudioMacWorkspaceAccessorTest.cs b/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/DefaultVisualStudioMacWorkspaceAccessorTest.cs
deleted file mode 100644
index bafd75783652..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/DefaultVisualStudioMacWorkspaceAccessorTest.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.VisualStudio.Editor.Razor;
-using Microsoft.VisualStudio.Text;
-using Moq;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor
-{
-    public class DefaultVisualStudioMacWorkspaceAccessorTest
-    {
-        [Fact]
-        public void TryGetWorkspace_NoHostProject_ReturnsFalse()
-        {
-            // Arrange
-            var workspaceAccessor = new DefaultVisualStudioMacWorkspaceAccessor(Mock.Of<TextBufferProjectService>());
-            var textBuffer = Mock.Of<ITextBuffer>();
-
-            // Act
-            var result = workspaceAccessor.TryGetWorkspace(textBuffer, out var workspace);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        // -------------------------------------------------------------------------------------------
-        // Purposefully do not have any more tests here because that would involve mocking MonoDevelop 
-        // types. The default constructors for the Solution / DotNetProject MonoDevelop types change
-        // static classes (they assume they're being created in an IDE).
-        // -------------------------------------------------------------------------------------------
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/Documents/VisualStudioMacFileChangeTrackerTest.cs b/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/Documents/VisualStudioMacFileChangeTrackerTest.cs
deleted file mode 100644
index 6fc730698653..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/Documents/VisualStudioMacFileChangeTrackerTest.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis.Razor;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Editor.Razor.Documents
-{
-    public class VisualStudioMacFileChangeTrackerTest : ForegroundDispatcherTestBase
-    {
-        [ForegroundFact]
-        public void StartListening_AdvisesForFileChange()
-        {
-            // Arrange
-            var tracker = new TestFileChangeTracker("C:/_ViewImports.cshtml", Dispatcher);
-
-            // Act
-            tracker.StartListening();
-
-            // Assert
-            Assert.Equal(1, tracker.AttachToFileServiceEventsCount);
-        }
-
-        [ForegroundFact]
-        public void StartListening_AlreadyListening_DoesNothing()
-        {
-            // Arrange
-            var tracker = new TestFileChangeTracker("C:/_ViewImports.cshtml", Dispatcher);
-            tracker.StartListening();
-
-            // Act
-            tracker.StartListening();
-
-            // Assert
-            Assert.Equal(1, tracker.AttachToFileServiceEventsCount);
-        }
-
-        [ForegroundFact]
-        public void StopListening_UnadvisesForFileChange()
-        {
-            // Arrange
-            var tracker = new TestFileChangeTracker("C:/_ViewImports.cshtml", Dispatcher);
-            tracker.StartListening(); // Start listening for changes.
-
-            // Act
-            tracker.StopListening();
-
-            // Assert
-            Assert.Equal(1, tracker.AttachToFileServiceEventsCount);
-            Assert.Equal(1, tracker.DetachFromFileServiceEventsCount);
-        }
-
-        [ForegroundFact]
-        public void StopListening_NotListening_DoesNothing()
-        {
-            // Arrange
-            var tracker = new TestFileChangeTracker("C:/_ViewImports.cshtml", Dispatcher);
-
-            // Act
-            tracker.StopListening();
-
-            // Assert
-
-            Assert.Equal(0, tracker.AttachToFileServiceEventsCount);
-            Assert.Equal(0, tracker.DetachFromFileServiceEventsCount);
-        }
-
-        private class TestFileChangeTracker : VisualStudioMacFileChangeTracker
-        {
-            public TestFileChangeTracker(
-                string filePath, 
-                ForegroundDispatcher foregroundDispatcher) : base(filePath, foregroundDispatcher)
-            {
-            }
-
-            public int AttachToFileServiceEventsCount { get; private set; }
-
-            public int DetachFromFileServiceEventsCount { get; private set; }
-
-            protected override void AttachToFileServiceEvents() => AttachToFileServiceEventsCount++;
-
-            protected override void DetachFromFileServiceEvents() => DetachFromFileServiceEventsCount++;
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/FallbackRazorProjectHostTest.cs b/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/FallbackRazorProjectHostTest.cs
deleted file mode 100644
index e5add6b0435e..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/FallbackRazorProjectHostTest.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using Xunit;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor.ProjectSystem
-{
-    public class FallbackRazorProjectHostTest
-    {
-        [Theory(Skip = "MonoDevelop.Core.FilePath cannot be loaded due to strong name issues.")]
-        [InlineData(null)]
-        [InlineData("")]
-        public void IsMvcAssembly_FailsIfNullOrEmptyFilePath(string filePath)
-        {
-            // Arrange
-            var assemblyFilePath = new FilePath(filePath);
-            var assemblyReference = new AssemblyReference(assemblyFilePath);
-
-            // Act
-            var result = FallbackRazorProjectHost.IsMvcAssembly(assemblyReference);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact(Skip = "MonoDevelop.Core.FilePath cannot be loaded due to strong name issues.")]
-        public void IsMvcAssembly_FailsIfNotMvc()
-        {
-            // Arrange
-            var assemblyFilePath = new FilePath("C:/Path/To/Assembly.dll");
-            var assemblyReference = new AssemblyReference(assemblyFilePath);
-
-            // Act
-            var result = FallbackRazorProjectHost.IsMvcAssembly(assemblyReference);
-
-            // Assert
-            Assert.False(result);
-        }
-
-        [Fact(Skip = "MonoDevelop.Core.FilePath cannot be loaded due to strong name issues.")]
-        public void IsMvcAssembly_SucceedsIfMvc()
-        {
-            // Arrange
-            var assemblyFilePath = new FilePath("C:/Path/To/Microsoft.AspNetCore.Mvc.Razor.dll");
-            var assemblyReference = new AssemblyReference(assemblyFilePath);
-
-            // Act
-            var result = FallbackRazorProjectHost.IsMvcAssembly(assemblyReference);
-
-            // Assert
-            Assert.True(result);
-        }
-
-        // -------------------------------------------------------------------------------------------
-        // Purposefully do not have any more tests here because that would involve mocking MonoDevelop 
-        // types. The default constructors for the Solution / DotNetProject MonoDevelop types change
-        // static classes (they assume they're being created in an IDE).
-        // -------------------------------------------------------------------------------------------
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test.csproj b/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test.csproj
deleted file mode 100644
index a413433e4a34..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Microsoft.CodeAnalysis.Razor.Workspaces.Test\Shared\**\*.cs">
-      <Link>Shared\%(RecursiveDir)%(FileName)%(Extension)</Link>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Mac.LanguageServices.Razor\Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj" />
-    <ProjectReference Include="..\Microsoft.VisualStudio.Editor.Razor.Test.Common\Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
-    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/ProjectBuildChangeTriggerTest.cs b/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/ProjectBuildChangeTriggerTest.cs
deleted file mode 100644
index b0ca2cdfe7a9..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/ProjectBuildChangeTriggerTest.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Editor.Razor;
-using MonoDevelop.Projects;
-using Moq;
-using Xunit;
-using Project = Microsoft.CodeAnalysis.Project;
-using Workspace = Microsoft.CodeAnalysis.Workspace;
-
-namespace Microsoft.VisualStudio.Mac.LanguageServices.Razor
-{
-    public class ProjectBuildChangeTriggerTest : ForegroundDispatcherTestBase
-    {
-        public ProjectBuildChangeTriggerTest()
-        {
-            SomeProject = new HostProject("c:\\SomeProject\\SomeProject.csproj", FallbackRazorConfiguration.MVC_1_0);
-            SomeOtherProject = new HostProject("c:\\SomeOtherProject\\SomeOtherProject.csproj", FallbackRazorConfiguration.MVC_2_0);
-
-            Workspace = TestWorkspace.Create(w =>
-            {
-                SomeWorkspaceProject = w.AddProject(ProjectInfo.Create(
-                    ProjectId.CreateNewId(),
-                    VersionStamp.Create(),
-                    "SomeProject",
-                    "SomeProject",
-                    LanguageNames.CSharp,
-                    filePath: SomeProject.FilePath));
-
-                SomeOtherWorkspaceProject = w.AddProject(ProjectInfo.Create(
-                    ProjectId.CreateNewId(),
-                    VersionStamp.Create(),
-                    "SomeOtherProject",
-                    "SomeOtherProject",
-                    LanguageNames.CSharp,
-                    filePath: SomeOtherProject.FilePath));
-            });
-        }
-
-        private HostProject SomeProject { get; }
-
-        private HostProject SomeOtherProject { get; }
-
-        private Project SomeWorkspaceProject { get; set; }
-
-        private Project SomeOtherWorkspaceProject { get; set; }
-
-        private Workspace Workspace { get; }
-
-        [ForegroundFact]
-        public void ProjectOperations_EndBuild_Invokes_WorkspaceProjectChanged()
-        {
-            // Arrange
-            var expectedProjectPath = SomeProject.FilePath;
-            var projectService = CreateProjectService(expectedProjectPath);
-
-            var args = new BuildEventArgs(monitor: null, success: true);
-
-            var projectSnapshots = new[]
-            {
-                new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, SomeProject, SomeWorkspaceProject)),
-                new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, SomeOtherProject, SomeOtherWorkspaceProject)),
-            };
-
-            var projectManager = new Mock<ProjectSnapshotManagerBase>(MockBehavior.Strict);
-            projectManager.SetupGet(p => p.Workspace).Returns(Workspace);
-            projectManager
-                .Setup(p => p.GetLoadedProject(SomeProject.FilePath))
-                .Returns(projectSnapshots[0]);
-            projectManager
-                .Setup(p => p.WorkspaceProjectChanged(It.IsAny<Project>()))
-                .Callback<Project>(c => Assert.Equal(expectedProjectPath, c.FilePath));
-
-            var trigger = new ProjectBuildChangeTrigger(Dispatcher, projectService, projectManager.Object);
-
-            // Act
-            trigger.ProjectOperations_EndBuild(null, args);
-
-            // Assert
-            projectManager.VerifyAll();
-        }
-
-        [ForegroundFact]
-        public void ProjectOperations_EndBuild_ProjectWithoutWorkspaceProject_Noops()
-        {
-            // Arrange
-            var projectService = CreateProjectService(SomeProject.FilePath);
-
-            var args = new BuildEventArgs(monitor: null, success: true);
-            var projectSnapshots = new[]
-            {
-                new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, SomeProject, null)),
-                new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, SomeOtherProject, SomeOtherWorkspaceProject)),
-            };
-
-            var projectManager = new Mock<ProjectSnapshotManagerBase>();
-            projectManager.SetupGet(p => p.Workspace).Returns(Workspace);
-            projectManager
-                .Setup(p => p.GetLoadedProject(SomeProject.FilePath))
-                .Returns(projectSnapshots[0]);
-            projectManager
-                .Setup(p => p.WorkspaceProjectChanged(It.IsAny<Project>()))
-                .Throws<InvalidOperationException>();
-
-            var trigger = new ProjectBuildChangeTrigger(Dispatcher, projectService, projectManager.Object);
-
-            // Act & Assert
-            trigger.ProjectOperations_EndBuild(null, args);
-        }
-
-        [ForegroundFact]
-        public void ProjectOperations_EndBuild_UntrackedProject_Noops()
-        {
-            // Arrange
-            var projectService = CreateProjectService("Path/To/Project");
-
-            var args = new BuildEventArgs(monitor: null, success: true);
-            var projectSnapshots = new[]
-            {
-                new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, SomeProject, null)),
-                new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, SomeOtherProject, SomeOtherWorkspaceProject)),
-            };
-
-            var projectManager = new Mock<ProjectSnapshotManagerBase>();
-            projectManager.SetupGet(p => p.Workspace).Returns(Workspace);
-            projectManager
-                .Setup(p => p.GetLoadedProject(SomeProject.FilePath))
-                .Returns(projectSnapshots[0]);
-            projectManager
-                .Setup(p => p.WorkspaceProjectChanged(It.IsAny<Project>()))
-                .Throws<InvalidOperationException>();
-
-            var trigger = new ProjectBuildChangeTrigger(Dispatcher, projectService, projectManager.Object);
-
-            // Act & Assert
-            trigger.ProjectOperations_EndBuild(null, args);
-        }
-
-        [ForegroundFact]
-        public void ProjectOperations_EndBuild_BuildFailed_Noops()
-        {
-            // Arrange
-            var args = new BuildEventArgs(monitor: null, success: false);
-            var projectService = new Mock<TextBufferProjectService>();
-            projectService.Setup(p => p.IsSupportedProject(null)).Throws<InvalidOperationException>();
-            var projectManager = new Mock<ProjectSnapshotManagerBase>();
-            projectManager.SetupGet(p => p.Workspace).Throws<InvalidOperationException>();
-            var trigger = new ProjectBuildChangeTrigger(Dispatcher, projectService.Object, projectManager.Object);
-
-            // Act & Assert
-            trigger.ProjectOperations_EndBuild(null, args);
-        }
-
-        [ForegroundFact]
-        public void ProjectOperations_EndBuild_UnsupportedProject_Noops()
-        {
-            // Arrange
-            var args = new BuildEventArgs(monitor: null, success: true);
-            var projectService = new Mock<TextBufferProjectService>();
-            projectService.Setup(p => p.IsSupportedProject(null)).Returns(false);
-            var projectManager = new Mock<ProjectSnapshotManagerBase>();
-            projectManager.SetupGet(p => p.Workspace).Throws<InvalidOperationException>();
-            var trigger = new ProjectBuildChangeTrigger(Dispatcher, projectService.Object, projectManager.Object);
-
-            // Act & Assert
-            trigger.ProjectOperations_EndBuild(null, args);
-        }
-
-        private static TextBufferProjectService CreateProjectService(string projectPath)
-        {
-            var projectService = new Mock<TextBufferProjectService>();
-            projectService.Setup(p => p.GetProjectPath(null)).Returns(projectPath);
-            projectService.Setup(p => p.IsSupportedProject(null)).Returns(true);
-            return projectService.Object;
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/xunit.runner.json b/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/xunit.runner.json
deleted file mode 100644
index c04bb61fe68c..000000000000
--- a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/xunit.runner.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "methodDisplay": "method",
-  "shadowCopy": false
-}
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/AddinMetadata.props b/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/AddinMetadata.props
deleted file mode 100644
index 0797744c9a59..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/AddinMetadata.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <AddinId>RazorAddin</AddinId>
-    <AddinNamespace>Microsoft.VisualStudio.Mac</AddinNamespace>
-    <AddinDetailedName>Razor Language Services</AddinDetailedName>
-    <AddinCategory>Web Development</AddinCategory>
-    <Description>Language services for ASP.NET Core Razor</Description>
-  </PropertyGroup>
-</Project>
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj b/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj
deleted file mode 100644
index 9f6462e3a7b4..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj
+++ /dev/null
@@ -1,47 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="AddinMetadata.props" />
-  
-  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <AssemblyAttribute Include="Mono.Addins.AddinAttribute">
-      <_Parameter1>$(AddinId)</_Parameter1>
-      <Namespace>$(AddinNamespace)</Namespace>
-      <Version>$(AddinVersion)</Version>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="Mono.Addins.AddinNameAttribute">
-      <_Parameter1>$(AddinDetailedName)</_Parameter1>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="Mono.Addins.AddinCategoryAttribute">
-      <_Parameter1>$(AddinCategory)</_Parameter1>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="Mono.Addins.AddinDescriptionAttribute">
-      <_Parameter1>$(Description)</_Parameter1>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="Mono.Addins.AddinAuthorAttribute">
-      <_Parameter1>$(Authors)</_Parameter1>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="Mono.Addins.AddinDependencyAttribute">
-      <_Parameter1>::MonoDevelop.Ide</_Parameter1>
-      <_Parameter2>7.4</_Parameter2>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="Mono.Addins.AddinDependencyAttribute">
-      <_Parameter1>::MonoDevelop.Core</_Parameter1>
-      <_Parameter2>7.4</_Parameter2>
-    </AssemblyAttribute>
-    </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\_Manifest.addin.xml" LogicalName="_Manifest.addin.xml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Mono.Addins" Version="$(MonoAddinsPackageVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Mac.LanguageServices.Razor\Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Properties/_Manifest.addin.xml b/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Properties/_Manifest.addin.xml
deleted file mode 100644
index 0c81e6caf6e7..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Properties/_Manifest.addin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ExtensionModel>
-  <Runtime>
-    <Import assembly="Microsoft.VisualStudio.Editor.Razor.dll" />
-    <Import assembly="Microsoft.CodeAnalysis.Razor.Workspaces.dll" />
-    <Import assembly="Microsoft.AspNetCore.Razor.Language.dll" />
-    <Import assembly="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" />
-    <Import assembly="Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
-    <Import assembly="Microsoft.CodeAnalysis.Razor.dll" />
-    <Import assembly="Microsoft.VisualStudio.Mac.LanguageServices.Razor.dll" />
-  </Runtime>
-  <Dependencies>
-    <Addin id="::MonoDevelop.Core" version="7.5" />
-    <Addin id="::MonoDevelop.Ide" version="7.5" />
-  </Dependencies>
-  
-  <!-- MEF catalog -->
-  <Extension path="/MonoDevelop/Ide/Composition">
-    <Assembly file="Microsoft.VisualStudio.Editor.Razor.dll" />
-    <Assembly file="Microsoft.CodeAnalysis.Razor.Workspaces.dll" />
-    <Assembly file="Microsoft.VisualStudio.Mac.LanguageServices.Razor.dll" />
-  </Extension>
-
-  <!-- Project Extensions -->
-  <Extension path = "/MonoDevelop/ProjectModel/ProjectModelExtensions">
-    <Class class="Microsoft.VisualStudio.Mac.RazorAddin.RazorProjectExtension" insertafter="FinalStep" />
-  </Extension>
-</ExtensionModel>
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/RazorAddin.cs b/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/RazorAddin.cs
deleted file mode 100644
index 276db71f2d28..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/RazorAddin.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.VisualStudio.Mac.RazorAddin
-{
-    public static class RazorAddin
-    {
-        public const string Version = "7.5";
-    }
-}
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/RazorProjectExtension.cs b/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/RazorProjectExtension.cs
deleted file mode 100644
index 2c69a1d298ab..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/RazorProjectExtension.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Mac.LanguageServices.Razor.ProjectSystem;
-using MonoDevelop.Ide.Composition;
-using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Projects;
-
-namespace Microsoft.VisualStudio.Mac.RazorAddin
-{
-    internal class RazorProjectExtension : ProjectExtension
-    {
-        private readonly object _lock = new object();
-        private readonly ForegroundDispatcher _foregroundDispatcher;
-
-        public RazorProjectExtension()
-        {
-            _foregroundDispatcher = CompositionManager.GetExportedValue<ForegroundDispatcher>();
-        }
-
-        protected override void OnBoundToSolution()
-        {
-            if (!(Project is DotNetProject dotNetProject))
-            {
-                return;
-            }
-
-            DotNetProjectHost projectHost;
-            lock (_lock)
-            {
-                if (Project.ExtendedProperties.Contains(typeof(DotNetProjectHost)))
-                {
-                    // Already have a project host.
-                    return;
-                }
-
-                var projectHostFactory = CompositionManager.GetExportedValue<DotNetProjectHostFactory>();
-                projectHost = projectHostFactory.Create(dotNetProject);
-                Project.ExtendedProperties[typeof(DotNetProjectHost)] = projectHost;
-            }
-
-            // Once a workspace is created for the solution we'll setup our project host for the current project. The Razor world
-            // shares a lifetime with the workspace (as Roslyn services) so we need to ensure it exists prior to wiring the host
-            // world to the Roslyn world.
-            TypeSystemService.GetWorkspaceAsync(Project.ParentSolution).ContinueWith(task =>
-            {
-                if (task.IsFaulted || task.IsCanceled)
-                {
-                    // We only want to act if we could properly retrieve the workspace.
-                    return;
-                }
-
-                projectHost.Subscribe();
-            },
-            _foregroundDispatcher.ForegroundScheduler);
-        }
-    }
-}
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/AboutDialogInfoAttribute.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/AboutDialogInfoAttribute.cs
deleted file mode 100644
index 3d97da5190c1..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/AboutDialogInfoAttribute.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Reflection;
-using Microsoft.VisualStudio.Shell;
-
-namespace Microsoft.VisualStudio.RazorExtension
-{
-    public class AboutDialogInfoAttribute : RegistrationAttribute
-    {
-        private readonly string _detailsId;
-        private readonly string _name;
-        private readonly string _nameId;
-        private readonly string _packageGuid;
-
-        // nameId and detailsId are resource IDs, they should start with #
-        public AboutDialogInfoAttribute(string packageGuid, string name, string nameId, string detailsId)
-        {
-            _packageGuid = packageGuid;
-            _name = name;
-            _nameId = nameId;
-            _detailsId = detailsId;
-        }
-
-        // This is a resource ID it should start with #
-        public string IconResourceID { get; set; }
-
-        private string GetKeyName()
-        {
-            return "InstalledProducts\\" + _name;
-        }
-
-        public override void Register(RegistrationContext context)
-        {
-            var attribute = typeof(AboutDialogInfoAttribute).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
-            var version = attribute?.InformationalVersion;
-
-            using (var key = context.CreateKey(GetKeyName()))
-            {
-                key.SetValue(null, _nameId);
-                key.SetValue("Package", Guid.Parse(_packageGuid).ToString("B"));
-                key.SetValue("ProductDetails", _detailsId);
-                key.SetValue("UseInterface", false);
-                key.SetValue("UseVSProductID", false);
-
-                if (version != null)
-                {
-                    key.SetValue("PID", version);
-                }
-
-                if (IconResourceID != null)
-                {
-                    key.SetValue("LogoID", IconResourceID);
-                }
-            }
-        }
-
-        public override void Unregister(RegistrationContext context)
-        {
-            context.RemoveKey(GetKeyName());
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Behaviors/ItemSelectedBehavior.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Behaviors/ItemSelectedBehavior.cs
deleted file mode 100644
index deb020ff95e6..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Behaviors/ItemSelectedBehavior.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-
-namespace Microsoft.VisualStudio.RazorExtension.Behaviors
-{
-    public static class ItemSelectedBehavior
-    {
-        public static DependencyProperty ItemSelectedProperty =
-            DependencyProperty.RegisterAttached(nameof(Selector.SelectedItem),
-                typeof(ICommand),
-                typeof(ItemSelectedBehavior),
-                new FrameworkPropertyMetadata(null, new PropertyChangedCallback(ItemSelectedChanged)));
-
-        public static ICommand GetItemSelected(DependencyObject target)
-        {
-            return (ICommand)target.GetValue(ItemSelectedProperty);
-        }
-
-        public static void SetItemSelected(DependencyObject target, ICommand value)
-        {
-            target.SetValue(ItemSelectedProperty, value);
-        }
-
-        private static void ItemSelectedChanged(DependencyObject target, DependencyPropertyChangedEventArgs e)
-        {
-            var element = target as Selector;
-            if (element != null)
-            {
-                if ((e.NewValue != null) && (e.OldValue == null))
-                {
-                    element.SelectionChanged += Selector_SelectionChanged;
-                }
-
-                else if ((e.NewValue == null) && (e.OldValue != null))
-                {
-                    element.SelectionChanged -= Selector_SelectionChanged;
-                }
-            }
-        }
-
-        private static void Selector_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            var element = sender as Selector;
-            if (element != null)
-            {
-                ICommand command = (ICommand)GetItemSelected(element);
-                command.Execute(element.SelectedItem);
-            }
-        }
-    }
-}
-#endif
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoViewModel.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoViewModel.cs
deleted file mode 100644
index 36073681dcf9..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoViewModel.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-
-using System;
-using Microsoft.CodeAnalysis;
-using Microsoft.VisualStudio.Editor.Razor;
-
-namespace Microsoft.VisualStudio.RazorExtension.DocumentInfo
-{
-    public class RazorDocumentInfoViewModel : NotifyPropertyChanged
-    {
-        private readonly VisualStudioDocumentTracker _documentTracker;
-
-        public RazorDocumentInfoViewModel(VisualStudioDocumentTracker documentTracker)
-        {
-            if (documentTracker == null)
-            {
-                throw new ArgumentNullException(nameof(documentTracker));
-            }
-
-            _documentTracker = documentTracker;
-        }
-
-        public string Configuration => _documentTracker.Configuration?.ConfigurationName;
-
-        public bool IsSupportedDocument => _documentTracker.IsSupportedProject;
-
-        public Project Project
-        {
-            get
-            {
-                if (Workspace != null && ProjectId != null)
-                {
-                    return Workspace.CurrentSolution.GetProject(ProjectId);
-                }
-
-                return null;
-            }
-        }
-
-        public ProjectId ProjectId => _documentTracker.Project?.Id;
-
-        public Workspace Workspace => _documentTracker.Workspace;
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoWindow.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoWindow.cs
deleted file mode 100644
index 08a40cc24001..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoWindow.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Windows;
-using Microsoft.VisualStudio.ComponentModelHost;
-using Microsoft.VisualStudio.Editor;
-using Microsoft.VisualStudio.Editor.Razor;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.TextManager.Interop;
-
-namespace Microsoft.VisualStudio.RazorExtension.DocumentInfo
-{
-    [Guid("d8d83218-309c-4c8f-9c9f-38a6fead8dca")]
-    internal class RazorDocumentInfoWindow : ToolWindowPane
-    {
-        private IVsEditorAdaptersFactoryService _adapterFactory;
-        private RazorEditorFactoryService _editorFactoryService;
-        private IVsTextManager _textManager;
-        private IVsRunningDocumentTable _rdt;
-
-        private uint _cookie;
-        private ITextView _textView;
-        private VisualStudioDocumentTracker _documentTracker;
-
-        public RazorDocumentInfoWindow()
-            : base(null)
-        {
-            Caption = "Razor Document Info";
-
-            Content = new RazorDocumentInfoWindowControl();
-        }
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-
-            var component = (IComponentModel)GetService(typeof(SComponentModel));
-            _adapterFactory = component.GetService<IVsEditorAdaptersFactoryService>();
-            _editorFactoryService = component.GetService<RazorEditorFactoryService>();
-
-            _textManager = (IVsTextManager)GetService(typeof(SVsTextManager));
-            _rdt = (IVsRunningDocumentTable)GetService(typeof(SVsRunningDocumentTable));
-
-            var hr = _rdt.AdviseRunningDocTableEvents(new RdtEvents(this), out uint _cookie);
-            ErrorHandler.ThrowOnFailure(hr);
-        }
-
-        protected override void OnClose()
-        {
-            _rdt.UnadviseRunningDocTableEvents(_cookie);
-            _cookie = 0u;
-
-            base.OnClose();
-        }
-
-        private void OnBeforeDocumentWindowShow(IVsWindowFrame frame)
-        {
-            var vsTextView = VsShellUtilities.GetTextView(frame);
-            if (vsTextView == null)
-            {
-                return;
-            }
-
-            var textView = _adapterFactory.GetWpfTextView(vsTextView);
-            if (textView != null && textView != _textView)
-            {
-                _textView = textView;
-
-                if (_documentTracker != null)
-                {
-                    _documentTracker.ContextChanged -= DocumentTracker_ContextChanged;
-                }
-
-                var textBuffer = textView.BufferGraph.GetRazorBuffers().FirstOrDefault();
-                if (textBuffer == null)
-                {
-                    return;
-                }
-
-                if (!_editorFactoryService.TryGetDocumentTracker(textBuffer, out _documentTracker))
-                {
-                    return;
-                }
-
-                _documentTracker.ContextChanged += DocumentTracker_ContextChanged;
-
-                ((FrameworkElement)Content).DataContext = new RazorDocumentInfoViewModel(_documentTracker);
-            }
-        }
-
-        private void OnAfterDocumentWindowHide(IVsWindowFrame frame)
-        {
-            var vsTextView = VsShellUtilities.GetTextView(frame);
-
-            var textView = _adapterFactory.GetWpfTextView(vsTextView);
-            if (textView == _textView)
-            {
-                ((FrameworkElement)Content).DataContext = null;
-                _documentTracker.ContextChanged -= DocumentTracker_ContextChanged;
-
-                _textView = null;
-                _documentTracker = null;
-            }
-        }
-
-        private void DocumentTracker_ContextChanged(object sender, EventArgs e)
-        {
-            ((FrameworkElement)Content).DataContext = new RazorDocumentInfoViewModel(_documentTracker);
-        }
-
-        private class RdtEvents : IVsRunningDocTableEvents
-        {
-            private readonly RazorDocumentInfoWindow _window;
-
-            public RdtEvents(RazorDocumentInfoWindow window)
-            {
-                _window = window;
-            }
-
-            public int OnAfterFirstDocumentLock(uint docCookie, uint dwRDTLockType, uint dwReadLocksRemaining, uint dwEditLocksRemaining) => VSConstants.S_OK;
-
-            public int OnBeforeLastDocumentUnlock(uint docCookie, uint dwRDTLockType, uint dwReadLocksRemaining, uint dwEditLocksRemaining) => VSConstants.S_OK;
-
-            public int OnAfterSave(uint docCookie) => VSConstants.S_OK;
-
-            public int OnAfterAttributeChange(uint docCookie, uint grfAttribs) => VSConstants.S_OK;
-
-            public int OnBeforeDocumentWindowShow(uint docCookie, int fFirstShow, IVsWindowFrame pFrame)
-            {
-                _window.OnBeforeDocumentWindowShow(pFrame);
-                return VSConstants.S_OK;
-            }
-
-            public int OnAfterDocumentWindowHide(uint docCookie, IVsWindowFrame pFrame)
-            {
-                _window.OnAfterDocumentWindowHide(pFrame);
-                return VSConstants.S_OK;
-            }
-        }
-    }
-}
-#endif
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoWindowCommand.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoWindowCommand.cs
deleted file mode 100644
index 91b3bc7e2943..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoWindowCommand.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-
-using System;
-using System.ComponentModel.Design;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-
-namespace Microsoft.VisualStudio.RazorExtension.DocumentInfo
-{
-    /// <summary>
-    /// Command handler
-    /// </summary>
-    internal sealed class RazorDocumentInfoWindowCommand
-    {
-        /// <summary>
-        /// Command ID.
-        /// </summary>
-        public const int CommandId = 0x101;
-
-        /// <summary>
-        /// Command menu group (command set GUID).
-        /// </summary>
-        public static readonly Guid CommandSet = new Guid("eaaf8ee4-d120-4a4d-8b58-b138b7f00b96");
-
-        /// <summary>
-        /// VS Package that provides this command, not null.
-        /// </summary>
-        private readonly Package package;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RazorDocumentInfoWindowCommand"/> class.
-        /// Adds our command handlers for menu (commands must exist in the command table file)
-        /// </summary>
-        /// <param name="package">Owner package, not null.</param>
-        private RazorDocumentInfoWindowCommand(Package package)
-        {
-            if (package == null)
-            {
-                throw new ArgumentNullException("package");
-            }
-
-            this.package = package;
-
-            OleMenuCommandService commandService = this.ServiceProvider.GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
-            if (commandService != null)
-            {
-                var menuCommandID = new CommandID(CommandSet, CommandId);
-                var menuItem = new MenuCommand(this.ShowToolWindow, menuCommandID);
-                commandService.AddCommand(menuItem);
-            }
-        }
-
-        /// <summary>
-        /// Gets the instance of the command.
-        /// </summary>
-        public static RazorDocumentInfoWindowCommand Instance
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets the service provider from the owner package.
-        /// </summary>
-        private IServiceProvider ServiceProvider
-        {
-            get
-            {
-                return this.package;
-            }
-        }
-
-        /// <summary>
-        /// Initializes the singleton instance of the command.
-        /// </summary>
-        /// <param name="package">Owner package, not null.</param>
-        public static void Initialize(Package package)
-        {
-            Instance = new RazorDocumentInfoWindowCommand(package);
-        }
-
-        /// <summary>
-        /// Shows the tool window when the menu item is clicked.
-        /// </summary>
-        /// <param name="sender">The event sender.</param>
-        /// <param name="e">The event args.</param>
-        private void ShowToolWindow(object sender, EventArgs e)
-        {
-            // Get the instance number 0 of this tool window. This window is single instance so this instance
-            // is actually the only one.
-            // The last flag is set to true so that if the tool window does not exists it will be created.
-            ToolWindowPane window = this.package.FindToolWindow(typeof(RazorDocumentInfoWindow), 0, true);
-            if ((null == window) || (null == window.Frame))
-            {
-                throw new NotSupportedException("Cannot create tool window");
-            }
-
-            IVsWindowFrame windowFrame = (IVsWindowFrame)window.Frame;
-            Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(windowFrame.Show());
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoWindowControl.xaml b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoWindowControl.xaml
deleted file mode 100644
index 86a4064fa681..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoWindowControl.xaml
+++ /dev/null
@@ -1,31 +0,0 @@
-<UserControl x:Class="Microsoft.VisualStudio.RazorExtension.DocumentInfo.RazorDocumentInfoWindowControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             Background="{DynamicResource VsBrush.Window}"
-             Foreground="{DynamicResource VsBrush.WindowText}"
-             mc:Ignorable="d"
-             d:DesignHeight="300"
-             d:DesignWidth="300"
-             Name="MyToolWindow">
-    <StackPanel HorizontalAlignment="Stretch">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="3*" />
-                <ColumnDefinition Width="7*" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-            <Label Grid.Column="0" Grid.Row="0" Content="Project"/>
-            <Label Grid.Column="1" Grid.Row="0" Content="{Binding Project.Name}"/>
-            <Label Grid.Column="0" Grid.Row="1" Content="Is Supported"/>
-            <Label Grid.Column="1" Grid.Row="1" Content="{Binding IsSupportedDocument}"/>
-            <Label Grid.Column="0" Grid.Row="2" Content="Configuration"/>
-            <Label Grid.Column="1" Grid.Row="2" Content="{Binding Configuration}"/>
-        </Grid>
-    </StackPanel>
-</UserControl>
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoWindowControl.xaml.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoWindowControl.xaml.cs
deleted file mode 100644
index 01662fb063ed..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/DocumentInfo/RazorDocumentInfoWindowControl.xaml.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-
-using System.Windows.Controls;
-
-namespace Microsoft.VisualStudio.RazorExtension.DocumentInfo
-{
-    public partial class RazorDocumentInfoWindowControl : UserControl
-    {
-        public RazorDocumentInfoWindowControl()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
deleted file mode 100644
index 8ba762a40cb3..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
+++ /dev/null
@@ -1,378 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-  <PropertyGroup>
-    <VsixVersion>15.8</VsixVersion>
-    
-    <!-- VS does not like letters in package versions -->
-    <VSIXBuildNumber Condition="'$(BuildNumber)' == 't000'">99999</VSIXBuildNumber>
-    <VSIXBuildNumber Condition="'$(VSIXBuildNumber)' == ''">$(BuildNumber)</VSIXBuildNumber>
-    <VsixVersion Condition="'$(VSIXBuildNumber)'!=''">$(VsixVersion).$(VSIXBuildNumber)</VsixVersion>
-    <VsixVersion Condition="'$(VSIXBuildNumber)'==''">$(VsixVersion).999999</VsixVersion>
-    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <UseCodebase>true</UseCodebase>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\build\Key.snk</AssemblyOriginatorKeyFile>
-    <!-- Use the RoslynDev Experimental instance so we can mingle with local builds of Roslyn -->
-    <VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
-    <!-- Make sure debug launches the RoslynDev instance as well. -->
-    <StartAction>Program</StartAction>
-    <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
-    <StartArguments>/rootsuffix RoslynDev /log</StartArguments>
-    <!-- Required to place the vsix in the right location by WTE MSI -->
-    <ExtensionInstallationRoot>CommonExtensions</ExtensionInstallationRoot>
-    <ExtensionInstallationFolder>Microsoft\RazorLanguageServices</ExtensionInstallationFolder>
-    <IsProductComponent>true</IsProductComponent>
-    <ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
-    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
-  </PropertyGroup>
-  <Import Project="..\..\version.props" />
-  <Import Project="..\..\build\sources.props" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{D66B45B5-CBFD-4947-81F1-F30AB80EA992}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.VisualStudio.RazorExtension</RootNamespace>
-    <AssemblyName>Microsoft.VisualStudio.RazorExtension</AssemblyName>
-    <!--
-    We exclude some facade-only assemblies (i.e. assemblies without any implementation) from the VSIX using the SuppressFromVsix ItemGroup listed in this file.
-    The list is dependent on the framework being targeted. Changes to TargetFrameworkVersion would warrant rebuilding the SuppressFromVsix ItemGroup.
-    -->
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <GeneratePkgDefFile>true</GeneratePkgDefFile>
-    <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;RAZOR_EXTENSION_DEVELOPER_MODE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AboutDialogInfoAttribute.cs" />
-    <Compile Include="DocumentInfo\RazorDocumentInfoViewModel.cs" />
-    <Compile Include="DocumentInfo\RazorDocumentInfoWindow.cs" />
-    <Compile Include="DocumentInfo\RazorDocumentInfoWindowCommand.cs" />
-    <Compile Include="DocumentInfo\RazorDocumentInfoWindowControl.xaml.cs">
-      <DependentUpon>RazorDocumentInfoWindowControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Behaviors\ItemSelectedBehavior.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RazorInfo\DirectiveCollectionViewModel.cs" />
-    <Compile Include="RazorInfo\DirectiveItemViewModel.cs" />
-    <Compile Include="RazorInfo\DocumentCollectionViewModel.cs" />
-    <Compile Include="RazorInfo\DocumentItemViewModel.cs" />
-    <Compile Include="NotifyPropertyChanged.cs" />
-    <Compile Include="RazorInfo\NullToEnabledConverter.cs" />
-    <Compile Include="RazorInfo\ProjectViewModel.cs" />
-    <Compile Include="RazorInfo\ProjectPropertyItemViewModel.cs" />
-    <Compile Include="RazorInfo\RazorInfoToolWindow.cs" />
-    <Compile Include="RazorInfo\RazorInfoToolWindowCommand.cs" />
-    <Compile Include="RazorInfo\RazorInfoViewModel.cs" />
-    <Compile Include="RazorInfo\TagHelperCollectionViewModel.cs" />
-    <Compile Include="RazorPackage.cs" />
-    <Compile Include="RazorInfo\ProjectPropertyCollectionViewModel.cs" />
-    <Compile Include="RelayCommand.cs" />
-    <Compile Include="RazorInfo\TagHelperItemViewModel.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="razorLanguageService.servicehub.service.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="razorLanguageService64.servicehub.service.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="WebConfiguration.png">
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <None Include="source.extension.vsixmanifest">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="EnvDTE100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="EnvDTE90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Design" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <VSCTCompile Include="RazorPackage.vsct">
-      <ResourceName>Menus.ctmenu</ResourceName>
-    </VSCTCompile>
-    <Content Include="Resources\RazorInfoToolWindowCommand.png" />
-    <Content Include="Resources\RazorPackage.ico" />
-    <Page Include="RazorInfo\RazorInfoToolWindowControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DocumentInfo\RazorDocumentInfoWindowControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Compile Include="RazorInfo\RazorInfoToolWindowControl.xaml.cs">
-      <DependentUpon>RazorInfoToolWindowControl.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="VSPackage.resx">
-      <MergeWithCTO>true</MergeWithCTO>
-      <ManifestResourceName>VSPackage</ManifestResourceName>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj">
-      <Name>Microsoft.AspNetCore.Mvc.Razor.Extensions</Name>
-      <Private>False</Private>
-      <IncludeOutputGroupsInVSIX>
-      </IncludeOutputGroupsInVSIX>
-      <IncludeOutputGroupsInVSIXLocalOnly>
-      </IncludeOutputGroupsInVSIXLocalOnly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj">
-      <Name>Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X</Name>
-      <Private>False</Private>
-      <IncludeOutputGroupsInVSIX>
-      </IncludeOutputGroupsInVSIX>
-      <IncludeOutputGroupsInVSIXLocalOnly>
-      </IncludeOutputGroupsInVSIXLocalOnly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj">
-      <Project>{932f3c9c-a6c0-40d3-ba50-9309886242fc}</Project>
-      <Name>Microsoft.AspNetCore.Razor.Language</Name>
-      <Private>False</Private>
-      <IncludeOutputGroupsInVSIX>
-      </IncludeOutputGroupsInVSIX>
-      <IncludeOutputGroupsInVSIXLocalOnly>
-      </IncludeOutputGroupsInVSIXLocalOnly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj">
-      <Name>Microsoft.CodeAnalysis.Razor</Name>
-      <Private>False</Private>
-      <IncludeOutputGroupsInVSIX>
-      </IncludeOutputGroupsInVSIX>
-      <IncludeOutputGroupsInVSIXLocalOnly>
-      </IncludeOutputGroupsInVSIXLocalOnly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor.Workspaces\Microsoft.CodeAnalysis.Razor.Workspaces.csproj">
-      <Project>{0f265874-c592-448b-bc4f-3430ab03e0dc}</Project>
-      <Name>Microsoft.CodeAnalysis.Razor.Workspaces</Name>
-      <Private>False</Private>
-      <IncludeOutputGroupsInVSIX>
-      </IncludeOutputGroupsInVSIX>
-      <IncludeOutputGroupsInVSIXLocalOnly>
-      </IncludeOutputGroupsInVSIXLocalOnly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Remote.Razor\Microsoft.CodeAnalysis.Remote.Razor.csproj">
-      <Project>{1840aad6-e26b-43ce-a2b1-7e74ad512888}</Project>
-      <Name>Microsoft.CodeAnalysis.Remote.Razor</Name>
-      <Private>False</Private>
-      <IncludeOutputGroupsInVSIX>
-      </IncludeOutputGroupsInVSIX>
-      <IncludeOutputGroupsInVSIXLocalOnly>
-      </IncludeOutputGroupsInVSIXLocalOnly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Editor.Razor\Microsoft.VisualStudio.Editor.Razor.csproj">
-      <Project>{0bcde75a-a438-46c7-95e9-391f029d07c5}</Project>
-      <Name>Microsoft.VisualStudio.Editor.Razor</Name>
-      <Private>False</Private>
-      <IncludeOutputGroupsInVSIX>
-      </IncludeOutputGroupsInVSIX>
-      <IncludeOutputGroupsInVSIXLocalOnly>
-      </IncludeOutputGroupsInVSIXLocalOnly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\Microsoft.VisualStudio.LanguageServices.Razor.csproj">
-      <Project>{92114fe9-cb07-4712-9aa4-afab65ca28e1}</Project>
-      <Name>Microsoft.VisualStudio.LanguageServices.Razor</Name>
-      <Private>False</Private>
-      <IncludeOutputGroupsInVSIX>
-      </IncludeOutputGroupsInVSIX>
-      <IncludeOutputGroupsInVSIXLocalOnly>
-      </IncludeOutputGroupsInVSIXLocalOnly>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <!--
-      Versions must be written here instead of being set as MSBuild variable.
-      See https://github.com/dotnet/project-system/issues/2129.
-    -->
-    <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="15.0.26606" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.0.26606" />
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.7.109" />
-  </ItemGroup>
-  <ItemDefinitionGroup>
-    <SuppressFromVsix>
-      <Visible>false</Visible>
-    </SuppressFromVsix>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <SuppressFromVsix Include="Esent.Interop.dll" />
-    <SuppressFromVsix Include="Microsoft.CodeAnalysis.CSharp.EditorFeatures.dll" />
-    <SuppressFromVsix Include="Microsoft.CodeAnalysis.EditorFeatures.dll" />
-    <SuppressFromVsix Include="Microsoft.CodeAnalysis.EditorFeatures.Text.dll" />
-    <SuppressFromVsix Include="Microsoft.CodeAnalysis.Elfie.dll" />
-    <SuppressFromVsix Include="Microsoft.CodeAnalysis.Features.dll" />
-    <SuppressFromVsix Include="Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.dll" />
-    <SuppressFromVsix Include="System.AppContext.dll" />
-    <SuppressFromVsix Include="System.Console.dll" />
-    <SuppressFromVsix Include="System.Diagnostics.FileVersionInfo.dll" />
-    <SuppressFromVsix Include="System.Diagnostics.StackTrace.dll" />
-    <SuppressFromVsix Include="System.IO.Compression.dll" />
-    <SuppressFromVsix Include="System.IO.FileSystem.dll" />
-    <SuppressFromVsix Include="System.IO.FileSystem.Primitives.dll" />
-    <SuppressFromVsix Include="System.Runtime.InteropServices.RuntimeInformation.dll" />
-    <SuppressFromVsix Include="System.Security.Cryptography.Algorithms.dll" />
-    <SuppressFromVsix Include="System.Security.Cryptography.Encoding.dll" />
-    <SuppressFromVsix Include="System.Security.Cryptography.Primitives.dll" />
-    <SuppressFromVsix Include="System.Security.Cryptography.X509Certificates.dll" />
-    <SuppressFromVsix Include="System.Text.Encoding.CodePages.dll" />
-    <SuppressFromVsix Include="System.Threading.Thread.dll" />
-    <SuppressFromVsix Include="System.ValueTuple.dll" />
-    <SuppressFromVsix Include="System.Xml.ReaderWriter.dll" />
-    <SuppressFromVsix Include="System.Xml.XmlDocument.dll" />
-    <SuppressFromVsix Include="System.Xml.XPath.dll" />
-    <SuppressFromVsix Include="System.Xml.XPath.XDocument.dll" />
-  </ItemGroup>
-  <Target Name="CopySymbolsToOutput" AfterTargets="Build" Condition="'$(SymbolsPublishDir)' != ''">
-    <Copy SourceFiles="$(OutDir)$(AssemblyName).pdb" DestinationFolder="$(SymbolsPublishDir)" />
-  </Target>
-  <!-- Include Razor SDK design time assets in the VSIX -->
-  <ItemGroup>
-    <Content Include="..\..\src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Microsoft.NET.Sdk.Razor.DesignTime.targets">
-      <IncludeInVsix>true</IncludeInVsix>
-      <InstallRoot>MSBuild</InstallRoot>
-      <VSIXSubPath>Microsoft\VisualStudio\Razor\</VSIXSubPath>
-    </Content>
-    <Content Include="..\..\src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Rules\*.xaml">
-      <IncludeInVsix>true</IncludeInVsix>
-      <InstallRoot>MSBuild</InstallRoot>
-      <VSIXSubPath>Microsoft\VisualStudio\Razor\Rules\</VSIXSubPath>
-    </Content>
-  </ItemGroup>
-  <!--
-    Begin workaround for https://github.com/dotnet/sdk/issues/433
-
-    The VS SDK doesn't understand the new SDK-style of projects, so  we need to manually add our project
-    references as VSIXSourceItems.
-  -->
-  <ItemDefinitionGroup>
-    <VSIXSourceItem>
-      <Visible>false</Visible>
-    </VSIXSourceItem>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <VSIXSourceItem Include="..\..\src\Microsoft.CodeAnalysis.Remote.Razor\bin\$(Configuration)\net46\Microsoft.CodeAnalysis.Remote.Razor.dll" />
-    <VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
-    <VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" />
-    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.AspNetCore.Razor.Language.dll" />
-    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.CodeAnalysis.Razor.dll" />
-    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.CodeAnalysis.Razor.Workspaces.dll" />
-    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.VisualStudio.Editor.Razor.dll" />
-    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.VisualStudio.LanguageServices.Razor.dll" />
-    <Content Include="@(VSIXSourceItem)">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <!-- End workaround for https://github.com/dotnet/sdk/issues/433 -->
-  <Target Name="GetBuildVersion" Outputs="$(VsixVersion)" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets')" />
-  <!-- Must be defined after the CSharp.targets -->
-  <PropertyGroup>
-    <_GeneratedVSIXAssemblyInfoInputsCacheFile>$(IntermediateOutputPath)$(MSBuildProjectName).VSIXAssemblyInfo.cache.txt</_GeneratedVSIXAssemblyInfoInputsCacheFile>
-    <_GeneratedVSIXAssemblyInfoFile>$(IntermediateOutputPath)$(MSBuildProjectName).VSIXAssemblyInfo.cs</_GeneratedVSIXAssemblyInfoFile>
-    <_GeneratedVSIXBindingRedirectFile>$(IntermediateOutputPath)$(MSBuildProjectName).BindingRedirects.cs</_GeneratedVSIXBindingRedirectFile>
-  </PropertyGroup>
-  <!--
-    We need to generate the assembly attributes for our assembly using the version from the build, so
-    we can flow it to the about dialog.
-  -->
-  <ItemGroup>
-    <_VSIXAssemblyAttribute Include="System.Reflection.AssemblyInformationalVersionAttribute">
-      <_Parameter1>$(VsixVersion)</_Parameter1>
-    </_VSIXAssemblyAttribute>
-  </ItemGroup>
-  <Target Name="_GenerateVSIXBindingRedirects"
-    DependsOnTargets="PrepareForBuild"
-    BeforeTargets="CoreCompile"
-    Inputs="$(MSBuildAllProjects)"
-    Outputs="$(_GeneratedVSIXBindingRedirectFile)">
-    <PropertyGroup>
-      <_GeneratedVSIXBindingRedirectContent>
-      <![CDATA[
-// <auto-generated />
-using Microsoft.VisualStudio.Shell;
-
-@(ProjectReference->'[assembly: ProvideBindingRedirection(AssemblyName = "%(Name)", GenerateCodeBase = true, PublicKeyToken = "adb9793829ddae60", OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = "$(VersionPrefix).0", NewVersion = "$(VersionPrefix).0")]', '%0A')
-]]>
-      </_GeneratedVSIXBindingRedirectContent>
-    </PropertyGroup>
-    <WriteLinesToFile Lines="$([MSBuild]::Escape($(_GeneratedVSIXBindingRedirectContent)))" File="$(_GeneratedVSIXBindingRedirectFile)" Overwrite="True" WriteOnlyWhenDifferent="True" />
-    <ItemGroup>
-      <Compile Include="$(_GeneratedVSIXBindingRedirectFile)">
-        <Visible>false</Visible>
-      </Compile>
-      <FileWrites Include="$(_GeneratedVSIXBindingRedirectFile)" />
-    </ItemGroup>
-  </Target>
-  <Target Name="_GenerateVSIXAssemblyAttributesHash" DependsOnTargets="PrepareForBuild" Condition="'@(_VSIXAssemblyAttribute)' != ''">
-    <!-- We only use up to _Parameter1 for most attributes, but other targets may add additional assembly attributes with multiple parameters. -->
-    <Hash ItemsToHash="@(_VSIXAssemblyAttribute->'%(Identity)%(_Parameter1)%(_Parameter2)%(_Parameter3)%(_Parameter4)%(_Parameter5)%(_Parameter6)%(_Parameter7)%(_Parameter8)')">
-      <Output TaskParameter="HashResult" PropertyName="_VSIXAssemblyAttributesHash" />
-    </Hash>
-    <WriteLinesToFile Lines="$(_VSIXAssemblyAttributesHash)" File="$(_GeneratedVSIXAssemblyInfoInputsCacheFile)" Overwrite="True" WriteOnlyWhenDifferent="True" />
-    <ItemGroup>
-      <FileWrites Include="$(_GeneratedVSIXAssemblyInfoInputsCacheFile)" />
-    </ItemGroup>
-  </Target>
-  <Target Name="_GenerateVSIXAssemblyAttributes" DependsOnTargets="_GenerateVSIXAssemblyAttributesHash" Inputs="$(_GeneratedVSIXAssemblyInfoInputsCacheFile)" Outputs="$(_GeneratedVSIXAssemblyInfoFile)" BeforeTargets="CoreCompile">
-    <ItemGroup>
-      <Compile Include="$(_GeneratedVSIXAssemblyInfoFile)">
-        <Visible>false</Visible>
-      </Compile>
-    </ItemGroup>
-    <WriteCodeFragment AssemblyAttributes="@(_VSIXAssemblyAttribute)" Language="C#" OutputFile="$(_GeneratedVSIXAssemblyInfoFile)" />
-    <ItemGroup>
-      <FileWrites Include="$(_GeneratedVSIXAssemblyInfoFile)" />
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/NotifyPropertyChanged.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/NotifyPropertyChanged.cs
deleted file mode 100644
index 569469e8ffa4..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/NotifyPropertyChanged.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.VisualStudio.RazorExtension
-{
-    public abstract class NotifyPropertyChanged : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-    }
-}
-#endif
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Properties/AssemblyInfo.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Properties/AssemblyInfo.cs
deleted file mode 100644
index 37ae5e2dec52..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.RazorExtension.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/DirectiveCollectionViewModel.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/DirectiveCollectionViewModel.cs
deleted file mode 100644
index ea04f1512bb6..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/DirectiveCollectionViewModel.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-
-using System;
-using System.Collections.ObjectModel;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
-{
-    public class DirectiveCollectionViewModel : NotifyPropertyChanged
-    {
-        private readonly ProjectSnapshot _project;
-
-        internal DirectiveCollectionViewModel(ProjectSnapshot project)
-        {
-            _project = project;
-
-            Directives = new ObservableCollection<DirectiveItemViewModel>();
-
-            var feature = _project.GetProjectEngine().EngineFeatures.OfType<IRazorDirectiveFeature>().FirstOrDefault();
-            foreach (var directive in feature?.Directives ?? Array.Empty<DirectiveDescriptor>())
-            {
-                Directives.Add(new DirectiveItemViewModel(directive));
-            }
-        }
-
-        public ObservableCollection<DirectiveItemViewModel> Directives { get; }
-    }
-}
-
-#endif
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/DirectiveItemViewModel.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/DirectiveItemViewModel.cs
deleted file mode 100644
index 7dcd0a7fbb15..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/DirectiveItemViewModel.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-using System.Text;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
-{
-    public class DirectiveItemViewModel : NotifyPropertyChanged
-    {
-        private readonly DirectiveDescriptor _directive;
-
-        internal DirectiveItemViewModel(DirectiveDescriptor directive)
-        {
-            _directive = directive;
-
-            var builder = new StringBuilder();
-            builder.Append("@");
-            builder.Append(_directive.Directive);
-
-            foreach (var token in _directive.Tokens)
-            {
-                builder.Append("(");
-                builder.Append(token.Kind.ToString());
-                builder.Append(")");
-            }
-
-            if (directive.Kind == DirectiveKind.CodeBlock || directive.Kind == DirectiveKind.RazorBlock)
-            {
-                builder.Append("{ ... }");
-            }
-
-            DisplayText = builder.ToString();
-        }
-
-        public string DisplayText { get; }
-
-        public string Name => _directive.Directive;
-    }
-}
-#endif
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/DocumentCollectionViewModel.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/DocumentCollectionViewModel.cs
deleted file mode 100644
index b384dae501dc..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/DocumentCollectionViewModel.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-
-using System;
-using System.Collections.ObjectModel;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
-{
-    public class DocumentCollectionViewModel : NotifyPropertyChanged
-    {
-        private readonly ProjectSnapshotManager _projectManager;
-        private readonly Action<Exception> _errorHandler;
-
-        private ProjectSnapshot _project;
-
-        internal DocumentCollectionViewModel(ProjectSnapshotManager projectManager, ProjectSnapshot project, Action<Exception> errorHandler)
-        {
-            _projectManager = projectManager;
-            _project = project;
-            _errorHandler = errorHandler;
-
-            Documents = new ObservableCollection<DocumentItemViewModel>();
-
-            foreach (var filePath in project.DocumentFilePaths)
-            {
-                Documents.Add(new DocumentItemViewModel(projectManager, project.GetDocument(filePath), _errorHandler));
-            }
-        }
-
-        public ObservableCollection<DocumentItemViewModel> Documents { get; }
-
-        internal void OnChange(ProjectChangeEventArgs e)
-        {
-            switch (e.Kind)
-            {
-                case ProjectChangeKind.DocumentAdded:
-                    {
-                        _project = _projectManager.GetLoadedProject(e.ProjectFilePath);
-                        Documents.Add(new DocumentItemViewModel(_projectManager, _project.GetDocument(e.DocumentFilePath), _errorHandler));
-                        break;
-                    }
-
-                case ProjectChangeKind.DocumentRemoved:
-                    {
-                        _project = _projectManager.GetLoadedProject(e.ProjectFilePath);
-
-                        for (var i = Documents.Count - 1; i >= 0; i--)
-                        {
-                            if (Documents[i].FilePath == e.DocumentFilePath)
-                            {
-                                Documents.RemoveAt(i);
-                                break;
-                            }
-                        }
-                        
-                        break;
-                    }
-
-                case ProjectChangeKind.DocumentChanged:
-                    {
-                        _project = _projectManager.GetLoadedProject(e.ProjectFilePath);
-                        for (var i = Documents.Count - 1; i >= 0; i--)
-                        {
-                            if (Documents[i].FilePath == e.DocumentFilePath)
-                            {
-                                Documents[i] = new DocumentItemViewModel(_projectManager, _project.GetDocument(e.DocumentFilePath), _errorHandler);
-                                break;
-                            }
-                        }
-
-                        break;
-                    }
-            }
-        }
-    }
-}
-
-#endif
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/DocumentItemViewModel.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/DocumentItemViewModel.cs
deleted file mode 100644
index 6bcf750c85ee..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/DocumentItemViewModel.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-
-using System;
-using System.Threading.Tasks;
-using System.Windows;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
-{
-    public class DocumentItemViewModel : NotifyPropertyChanged
-    {
-        private readonly ProjectSnapshotManager _snapshotManager;
-        private readonly DocumentSnapshot _document;
-        private readonly Action<Exception> _errorHandler;
-
-        private Visibility _progressVisibility;
-
-        internal DocumentItemViewModel(ProjectSnapshotManager snapshotManager, DocumentSnapshot document, Action<Exception> errorHandler)
-        {
-            _snapshotManager = snapshotManager;
-            _document = document;
-            _errorHandler = errorHandler;
-
-            InitializeGeneratedDocument();
-        }
-
-        public string FilePath => _document.FilePath;
-
-        public string StatusText => _snapshotManager.IsDocumentOpen(_document.FilePath) ? "Open" : "Closed";
-
-        public string TargetPath => _document.TargetPath;
-
-        public Visibility ProgressVisibility
-        {
-            get => _progressVisibility;
-            set
-            {
-                _progressVisibility = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private async void InitializeGeneratedDocument()
-        {
-            ProgressVisibility = Visibility.Hidden;
-
-            try
-            {
-                if (!_document.TryGetGeneratedOutput(out var result))
-                {
-                    ProgressVisibility = Visibility.Visible;
-                    await _document.GetGeneratedOutputAsync();
-                    await Task.Delay(250); // Force a delay for the UI
-                }
-            }
-            catch (Exception ex)
-            {
-                _errorHandler(ex);
-            }
-            finally
-            {
-                ProgressVisibility = Visibility.Hidden;
-            }
-        }
-    }
-}
-#endif
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/NullToEnabledConverter.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/NullToEnabledConverter.cs
deleted file mode 100644
index 89d7f6263dec..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/NullToEnabledConverter.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
-{
-    public class NullToEnabledConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (targetType == typeof(bool))
-            {
-                return value != null;
-            }
-
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return null;
-        }
-    }
-}
-#endif
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/ProjectPropertyCollectionViewModel.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/ProjectPropertyCollectionViewModel.cs
deleted file mode 100644
index 4a3c63d0882a..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/ProjectPropertyCollectionViewModel.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-
-using System.Collections.ObjectModel;
-using System.Linq;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
-{
-    public class ProjectPropertyCollectionViewModel : NotifyPropertyChanged
-    {
-        private readonly ProjectSnapshot _project;
-
-        internal ProjectPropertyCollectionViewModel(ProjectSnapshot project)
-        {
-            _project = project;
-            
-            Properties = new ObservableCollection<ProjectPropertyItemViewModel>();
-            Properties.Add(new ProjectPropertyItemViewModel("Language Version", _project.Configuration?.LanguageVersion.ToString()));
-            Properties.Add(new ProjectPropertyItemViewModel("Configuration", FormatConfiguration(_project)));
-            Properties.Add(new ProjectPropertyItemViewModel("Extensions", FormatExtensions(_project)));
-            Properties.Add(new ProjectPropertyItemViewModel("Workspace Project", _project.WorkspaceProject?.Name));
-        }
-
-        public ObservableCollection<ProjectPropertyItemViewModel> Properties { get; }
-
-        private static string FormatConfiguration(ProjectSnapshot project)
-        {
-            return $"{project.Configuration.ConfigurationName} ({project.Configuration.GetType().Name})";
-        }
-
-        private static string FormatExtensions(ProjectSnapshot project)
-        {
-            return $"{string.Join(", ", project.Configuration.Extensions.Select(e => e.ExtensionName))}";
-        }
-    }
-}
-
-#endif
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/ProjectPropertyItemViewModel.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/ProjectPropertyItemViewModel.cs
deleted file mode 100644
index 4a229a461ab6..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/ProjectPropertyItemViewModel.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-
-namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
-{
-    public class ProjectPropertyItemViewModel : NotifyPropertyChanged
-    {
-        internal ProjectPropertyItemViewModel(string name, string value)
-        {
-            Name = name;
-            Value = value;
-        }
-
-        public string Name { get; }
-
-        public string Value { get; }
-    }
-}
-#endif
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/ProjectViewModel.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/ProjectViewModel.cs
deleted file mode 100644
index fe385d58bd32..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/ProjectViewModel.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-using System.IO;
-
-namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
-{
-    public class ProjectViewModel : NotifyPropertyChanged
-    {
-        internal ProjectViewModel(string filePath)
-        {
-            FilePath = filePath;
-        }
-        
-        public string FilePath { get; }
-
-        public string Name => Path.GetFileNameWithoutExtension(FilePath);
-    }
-}
-#endif
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoToolWindow.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoToolWindow.cs
deleted file mode 100644
index f7ac4d9e2a5c..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoToolWindow.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-using System;
-using System.Runtime.InteropServices;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.ComponentModelHost;
-using Microsoft.VisualStudio.LanguageServices;
-using Microsoft.VisualStudio.LanguageServices.Razor;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-
-namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
-{
-    [Guid("079e9499-d150-40af-8876-3047f7942c2a")]
-    public class RazorInfoToolWindow : ToolWindowPane
-    {
-        private ProjectSnapshotManager _projectManager;
-        private VisualStudioWorkspace _workspace;
-
-        public RazorInfoToolWindow() : base(null)
-        {
-            Caption = "Razor Info";
-            Content = new RazorInfoToolWindowControl();
-        }
-
-        private RazorInfoViewModel DataContext
-        {
-            get => (RazorInfoViewModel)((RazorInfoToolWindowControl)Content).DataContext;
-            set => ((RazorInfoToolWindowControl)Content).DataContext = value;
-        }
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-
-            var componentModel = (IComponentModel)GetService(typeof(SComponentModel));
-            _workspace = componentModel.GetService<VisualStudioWorkspace>();
-
-            _projectManager = _workspace.Services.GetLanguageServices(RazorLanguage.Name).GetRequiredService<ProjectSnapshotManager>();
-            _projectManager.Changed += ProjectManager_Changed;
-
-            DataContext = new RazorInfoViewModel(_workspace, _projectManager, OnException);
-            
-            foreach (var project in _projectManager.Projects)
-            {
-                DataContext.Projects.Add(new ProjectViewModel(project.FilePath));
-            }
-
-            if (DataContext.Projects.Count > 0)
-            {
-                DataContext.SelectedProject = DataContext.Projects[0];
-            }
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _projectManager.Changed -= ProjectManager_Changed;
-            }
-        }
-
-        private void ProjectManager_Changed(object sender, ProjectChangeEventArgs e)
-        {
-            DataContext.OnChange(e);
-        }
-
-        private void OnException(Exception ex)
-        {
-            VsShellUtilities.ShowMessageBox(
-                this,
-                ex.ToString(),
-                "Razor Error",
-                OLEMSGICON.OLEMSGICON_CRITICAL,
-                OLEMSGBUTTON.OLEMSGBUTTON_OK,
-                OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST);
-        }
-    }
-}
-#endif
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoToolWindowCommand.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoToolWindowCommand.cs
deleted file mode 100644
index 5d4c4d070089..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoToolWindowCommand.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-using System;
-using System.ComponentModel.Design;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-
-namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
-{
-    /// <summary>
-    /// Command handler
-    /// </summary>
-    internal sealed class RazorInfoToolWindowCommand
-    {
-        /// <summary>
-        /// Command ID.
-        /// </summary>
-        public const int CommandId = 0x0100;
-
-        /// <summary>
-        /// Command menu group (command set GUID).
-        /// </summary>
-        public static readonly Guid CommandSet = new Guid("eaaf8ee4-d120-4a4d-8b58-b138b7f00b96");
-
-        /// <summary>
-        /// VS Package that provides this command, not null.
-        /// </summary>
-        private readonly Package package;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RazorInfoToolWindowCommand"/> class.
-        /// Adds our command handlers for menu (commands must exist in the command table file)
-        /// </summary>
-        /// <param name="package">Owner package, not null.</param>
-        private RazorInfoToolWindowCommand(Package package)
-        {
-            if (package == null)
-            {
-                throw new ArgumentNullException("package");
-            }
-
-            this.package = package;
-
-            OleMenuCommandService commandService = this.ServiceProvider.GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
-            if (commandService != null)
-            {
-                var menuCommandID = new CommandID(CommandSet, CommandId);
-                var menuItem = new MenuCommand(this.ShowToolWindow, menuCommandID);
-                commandService.AddCommand(menuItem);
-            }
-        }
-
-        /// <summary>
-        /// Gets the instance of the command.
-        /// </summary>
-        public static RazorInfoToolWindowCommand Instance
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets the service provider from the owner package.
-        /// </summary>
-        private IServiceProvider ServiceProvider
-        {
-            get
-            {
-                return this.package;
-            }
-        }
-
-        /// <summary>
-        /// Initializes the singleton instance of the command.
-        /// </summary>
-        /// <param name="package">Owner package, not null.</param>
-        public static void Initialize(Package package)
-        {
-            Instance = new RazorInfoToolWindowCommand(package);
-        }
-
-        /// <summary>
-        /// Shows the tool window when the menu item is clicked.
-        /// </summary>
-        /// <param name="sender">The event sender.</param>
-        /// <param name="e">The event args.</param>
-        private void ShowToolWindow(object sender, EventArgs e)
-        {
-            // Get the instance number 0 of this tool window. This window is single instance so this instance
-            // is actually the only one.
-            // The last flag is set to true so that if the tool window does not exists it will be created.
-            ToolWindowPane window = this.package.FindToolWindow(typeof(RazorInfoToolWindow), 0, true);
-            if ((null == window) || (null == window.Frame))
-            {
-                throw new NotSupportedException("Cannot create tool window");
-            }
-
-            IVsWindowFrame windowFrame = (IVsWindowFrame)window.Frame;
-            Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(windowFrame.Show());
-        }
-    }
-}
-#endif
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoToolWindowControl.xaml b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoToolWindowControl.xaml
deleted file mode 100644
index f7fd186d6e33..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoToolWindowControl.xaml
+++ /dev/null
@@ -1,360 +0,0 @@
-<UserControl
-  x:Class="Microsoft.VisualStudio.RazorExtension.RazorInfo.RazorInfoToolWindowControl"
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-  xmlns:local="clr-namespace:Microsoft.VisualStudio.RazorExtension.RazorInfo"
-  xmlns:behaviors="clr-namespace:Microsoft.VisualStudio.RazorExtension.Behaviors"
-  Background="{DynamicResource VsBrush.Window}"
-  Foreground="{DynamicResource VsBrush.WindowText}"
-  mc:Ignorable="d"
-  d:DesignHeight="900"
-  d:DesignWidth="300"
-  Name="RazorInfoToolWindow">
-  <UserControl.Resources>
-    <local:NullToEnabledConverter x:Key="EnabledConverter"/>
-    <Style
-      x:Key="{x:Type Button}">
-      <Setter
-        Property="FrameworkElement.Margin"
-        Value="5" />
-      <Setter
-        Property="Control.Padding"
-        Value="5 2 5 2" />
-    </Style>
-    <Style
-      x:Key="{x:Type GridSplitter}">
-      <Setter
-        Property="FrameworkElement.Height"
-        Value="5" />
-      <Setter
-        Property="FrameworkElement.HorizontalAlignment"
-        Value="Stretch" />
-      <Setter
-        Property="FrameworkElement.VerticalAlignment"
-        Value="Bottom" />
-      <Setter
-        Property="GridSplitter.ShowsPreview"
-        Value="True" />
-    </Style>
-    <Style
-      x:Key="{x:Type ComboBox}">
-      <Setter
-        Property="FrameworkElement.Margin"
-        Value="5" />
-    </Style>
-    <Style
-      x:Key="{x:Type Label}">
-      <Setter
-        Property="FrameworkElement.Margin"
-        Value="5" />
-    </Style>
-    <Style
-      x:Key="{x:Type ListBox}">
-      <Setter
-        Property="FrameworkElement.Margin"
-        Value="5" />
-    </Style>
-    <Style
-      x:Key="{x:Type ListView}">
-      <Setter
-        Property="FrameworkElement.Margin"
-        Value="5" />
-    </Style>
-  </UserControl.Resources>
-  <ScrollViewer
-    VerticalScrollBarVisibility="Visible">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition
-          Height="Auto" />
-        <RowDefinition
-          Height="Auto" />
-        <RowDefinition
-          Height="Auto" />
-        <RowDefinition
-          Height="Auto" />
-        <RowDefinition
-          Height="Auto" />
-        <RowDefinition
-          Height="Auto" />
-        <RowDefinition
-          Height="Auto" />
-        <RowDefinition
-          Height="Auto" />
-        <RowDefinition
-          Height="Auto" />
-      </Grid.RowDefinitions>
-      <Grid
-        Grid.Row="0">
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition
-            Width="Auto" />
-          <ColumnDefinition
-            Width="*" />
-          <ColumnDefinition
-            Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <Label
-          Grid.Column="0"
-          Content="Select Project" />
-        <ComboBox
-          Grid.Column="1"
-          ItemsSource="{Binding Projects}"
-          SelectedValue="{Binding SelectedProject}">
-          <ItemsControl.ItemTemplate>
-            <DataTemplate>
-              <StackPanel
-                Orientation="Horizontal">
-                <Label
-                  Margin="0"
-                  Content="{Binding Name}" />
-              </StackPanel>
-            </DataTemplate>
-          </ItemsControl.ItemTemplate>
-        </ComboBox>
-        <Button
-          Grid.Column="2"
-          Content="Update"
-          Command="{Binding UpdateCommand}" />
-      </Grid>
-      <GridSplitter
-        Grid.Row="1"
-        IsEnabled="False" />
-      <Grid
-        Grid.Row="2"
-        IsEnabled="{Binding ProjectProperties, Converter={StaticResource EnabledConverter}}"
-        Height="150">
-        <ListView
-          ItemsSource="{Binding ProjectProperties.Properties}">
-          <ListView.View>
-            <GridView
-              AllowsColumnReorder="False">
-              <GridViewColumn
-                Width="150">
-                <GridViewColumnHeader
-                  Content="Property Name" />
-                <GridViewColumn.CellTemplate>
-                  <DataTemplate>
-                    <TextBlock
-                      TextWrapping="NoWrap"
-                      TextTrimming="CharacterEllipsis"
-                      Text="{Binding Path=Name, Mode=OneWay}" />
-                  </DataTemplate>
-                </GridViewColumn.CellTemplate>
-              </GridViewColumn>
-              <GridViewColumn
-                Width="Auto">
-                <GridViewColumnHeader
-                  Content="Property Value" />
-                <GridViewColumn.CellTemplate>
-                  <DataTemplate>
-                    <TextBlock
-                      TextAlignment="Right"
-                      Margin="0"
-                      TextWrapping="NoWrap"
-                      TextTrimming="CharacterEllipsis"
-                      Text="{Binding Path=Value, Mode=OneWay}" />
-                  </DataTemplate>
-                </GridViewColumn.CellTemplate>
-              </GridViewColumn>
-            </GridView>
-          </ListView.View>
-        </ListView>
-      </Grid>
-      <GridSplitter
-        Grid.Row="3" />
-      <Expander
-        Grid.Row="4"
-        IsEnabled="{Binding TagHelpers, Converter={StaticResource EnabledConverter}}">
-        <Expander.Header>
-          <!-- The complicated binding here makes the header stretch horizontally -->
-          <Grid
-            HorizontalAlignment="{Binding HorizontalAlignment, RelativeSource={RelativeSource AncestorType=ContentPresenter}, Mode=OneWayToSource}">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition
-                Width="Auto" />
-              <ColumnDefinition
-                Width="*" />
-            </Grid.ColumnDefinitions>
-            <Label
-              Grid.Column="0"
-              Content="Tag Helpers" />
-            <ProgressBar
-              Grid.Column="1"
-              Width="Auto"
-              Height="20"
-              Margin="5"
-              Visibility="{Binding TagHelpers.ProgressVisibility, TargetNullValue=Hidden, FallbackValue=Hidden}"
-              IsIndeterminate="True" />
-          </Grid>
-        </Expander.Header>
-        <ListView
-          ItemsSource="{Binding TagHelpers.TagHelpers}">
-          <ListView.View>
-            <GridView
-              AllowsColumnReorder="False">
-              <GridViewColumn
-                Width="150">
-                <GridViewColumnHeader
-                  Content="Target Element" />
-                <GridViewColumn.CellTemplate>
-                  <DataTemplate>
-                    <TextBlock
-                      TextWrapping="NoWrap"
-                      TextTrimming="CharacterEllipsis"
-                      Text="{Binding Path=TargetElement, Mode=OneWay}" />
-                  </DataTemplate>
-                </GridViewColumn.CellTemplate>
-              </GridViewColumn>
-              <GridViewColumn
-                Width="Auto">
-                <GridViewColumnHeader
-                  Content="Type Name" />
-                <GridViewColumn.CellTemplate>
-                  <DataTemplate>
-                    <TextBlock
-                      TextAlignment="Right"
-                      Margin="0"
-                      TextWrapping="NoWrap"
-                      TextTrimming="CharacterEllipsis"
-                      Text="{Binding Path=TypeName, Mode=OneWay}" />
-                  </DataTemplate>
-                </GridViewColumn.CellTemplate>
-              </GridViewColumn>
-              <GridViewColumn
-                Width="Auto">
-                <GridViewColumnHeader
-                  Content="Assembly Name" />
-                <GridViewColumn.CellTemplate>
-                  <DataTemplate>
-                    <TextBlock
-                      TextAlignment="Right"
-                      Margin="0"
-                      TextWrapping="NoWrap"
-                      TextTrimming="CharacterEllipsis"
-                      Text="{Binding Path=AssemblyName, Mode=OneWay}" />
-                  </DataTemplate>
-                </GridViewColumn.CellTemplate>
-              </GridViewColumn>
-            </GridView>
-          </ListView.View>
-        </ListView>
-      </Expander>
-      <GridSplitter
-        Grid.Row="5" />
-      <Expander
-        Grid.Row="6"
-        IsEnabled="{Binding Directives, Converter={StaticResource EnabledConverter}}">
-        <Expander.Header>
-          <Label
-            Content="Directives" />
-        </Expander.Header>
-        <ListView
-          ItemsSource="{Binding Directives.Directives}">
-          <ListView.View>
-            <GridView
-              AllowsColumnReorder="False">
-              <GridViewColumn
-                Width="150">
-                <GridViewColumnHeader
-                  Content="Directive" />
-                <GridViewColumn.CellTemplate>
-                  <DataTemplate>
-                    <TextBlock
-                      TextWrapping="NoWrap"
-                      TextTrimming="CharacterEllipsis"
-                      Text="{Binding Path=Name, Mode=OneWay}" />
-                  </DataTemplate>
-                </GridViewColumn.CellTemplate>
-              </GridViewColumn>
-              <GridViewColumn
-                Width="Auto">
-                <GridViewColumnHeader
-                  Content="Usage" />
-                <GridViewColumn.CellTemplate>
-                  <DataTemplate>
-                    <TextBlock
-                      TextAlignment="Right"
-                      Margin="0"
-                      TextWrapping="NoWrap"
-                      TextTrimming="CharacterEllipsis"
-                      Text="{Binding Path=DisplayText, Mode=OneWay}" />
-                  </DataTemplate>
-                </GridViewColumn.CellTemplate>
-              </GridViewColumn>
-            </GridView>
-          </ListView.View>
-        </ListView>
-      </Expander>
-      <GridSplitter
-        Grid.Row="7" />
-      <Expander
-        Grid.Row="8"
-        IsEnabled="{Binding Documents, Converter={StaticResource EnabledConverter}}">
-        <Expander.Header>
-          <Label
-            Content="Documents" />
-        </Expander.Header>
-        <ListView
-          ItemsSource="{Binding Documents.Documents}">
-          <ListView.View>
-            <GridView
-              AllowsColumnReorder="False">
-              <GridViewColumn
-                Width="50">
-                <GridViewColumnHeader
-                  Content="Status" />
-                <GridViewColumn.CellTemplate>
-                  <DataTemplate>
-                    <Grid
-                      HorizontalAlignment="{Binding HorizontalAlignment, RelativeSource={RelativeSource AncestorType=ContentPresenter}, Mode=OneWayToSource}">
-                      <ProgressBar
-                        Height="15"
-                        Width="40"
-                        IsIndeterminate="True"
-                        Visibility="{Binding Path=ProgressVisibility, FallbackValue=Hidden}" />
-                      <TextBlock
-                        TextWrapping="NoWrap"
-                        TextTrimming="CharacterEllipsis"
-                        Text="{Binding Path=StatusText, Mode=OneWay}" />
-                    </Grid>
-                  </DataTemplate>
-                </GridViewColumn.CellTemplate>
-              </GridViewColumn>
-              <GridViewColumn
-                Width="150">
-                <GridViewColumnHeader
-                  Content="Target Path" />
-                <GridViewColumn.CellTemplate>
-                  <DataTemplate>
-                    <TextBlock
-                      TextWrapping="NoWrap"
-                      TextTrimming="CharacterEllipsis"
-                      Text="{Binding Path=TargetPath, Mode=OneWay}" />
-                  </DataTemplate>
-                </GridViewColumn.CellTemplate>
-              </GridViewColumn>
-              <GridViewColumn
-                Width="Auto">
-                <GridViewColumnHeader
-                  Content="File Path" />
-                <GridViewColumn.CellTemplate>
-                  <DataTemplate>
-                    <TextBlock
-                      TextAlignment="Right"
-                      Margin="0"
-                      TextWrapping="NoWrap"
-                      TextTrimming="CharacterEllipsis"
-                      Text="{Binding Path=FilePath, Mode=OneWay}" />
-                  </DataTemplate>
-                </GridViewColumn.CellTemplate>
-              </GridViewColumn>
-            </GridView>
-          </ListView.View>
-        </ListView>
-      </Expander>
-    </Grid>
-  </ScrollViewer>
-</UserControl>
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoToolWindowControl.xaml.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoToolWindowControl.xaml.cs
deleted file mode 100644
index 57b5855cda67..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoToolWindowControl.xaml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
-{
-    public partial class RazorInfoToolWindowControl : UserControl
-    {
-        public RazorInfoToolWindowControl()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoViewModel.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoViewModel.cs
deleted file mode 100644
index 21cd7fec8e5f..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoViewModel.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-
-using System;
-using System.Collections.ObjectModel;
-using System.Windows.Input;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
-{
-    internal class RazorInfoViewModel : NotifyPropertyChanged
-    {
-        private readonly Workspace _workspace;
-        private readonly ProjectSnapshotManager _projectManager;
-        private readonly Action<Exception> _errorHandler;
-        
-        private ProjectViewModel _selectedProject;
-        private ProjectPropertyCollectionViewModel _projectProperties;
-        private DirectiveCollectionViewModel _directives;
-        private DocumentCollectionViewModel _documents;
-        private TagHelperCollectionViewModel _tagHelpers;
-        private ICommand _updateCommand;
-
-        public RazorInfoViewModel(Workspace workspace, ProjectSnapshotManager projectManager, Action<Exception> errorHandler)
-        {
-            _workspace = workspace;
-            _projectManager = projectManager;
-            _errorHandler = errorHandler;
-            
-            UpdateCommand = new RelayCommand<object>(ExecuteUpdate, CanExecuteUpdate);
-        }
-
-        public ObservableCollection<ProjectViewModel> Projects { get; } = new ObservableCollection<ProjectViewModel>();
-
-        public ProjectViewModel SelectedProject
-        {
-            get { return _selectedProject; }
-            set
-            {
-                _selectedProject = value;
-
-                OnPropertyChanged();
-                OnSelectedProjectChanged();
-            }
-        }
-
-        public ProjectPropertyCollectionViewModel ProjectProperties
-        {
-            get { return _projectProperties; }
-            set
-            {
-                _projectProperties = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public DirectiveCollectionViewModel Directives
-        {
-            get { return _directives; }
-            set
-            {
-                _directives = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public DocumentCollectionViewModel Documents
-        {
-            get { return _documents; }
-            set
-            {
-                _documents = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public TagHelperCollectionViewModel TagHelpers
-        {
-            get { return _tagHelpers; }
-            set
-            {
-                _tagHelpers = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public ICommand UpdateCommand
-        {
-            get { return _updateCommand; }
-            set
-            {
-                _updateCommand = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public void OnChange(ProjectChangeEventArgs e)
-        {
-            switch (e.Kind)
-            {
-                case ProjectChangeKind.ProjectAdded:
-                    {
-                        var added = new ProjectViewModel(e.ProjectFilePath);
-                        Projects.Add(added);
-
-                        if (Projects.Count == 1)
-                        {
-                            SelectedProject = added;
-                        }
-
-                        break;
-                    }
-
-                case ProjectChangeKind.ProjectRemoved:
-                    {
-                        ProjectViewModel removed = null;
-                        for (var i = Projects.Count - 1; i >= 0; i--)
-                        {
-                            var project = Projects[i];
-                            if (project.FilePath == e.ProjectFilePath)
-                            {
-                                removed = project;
-                                Projects.RemoveAt(i);
-                                break;
-                            }
-                        }
-
-                        if (SelectedProject == removed)
-                        {
-                            SelectedProject = null;
-                        }
-
-                        break;
-                    }
-
-                case ProjectChangeKind.ProjectChanged:
-                    {
-                        if (SelectedProject != null && SelectedProject.FilePath == e.ProjectFilePath)
-                        {
-                            OnSelectedProjectChanged();
-                        }
-
-                        break;
-                    }
-
-                case ProjectChangeKind.DocumentAdded:
-                case ProjectChangeKind.DocumentRemoved:
-                case ProjectChangeKind.DocumentChanged:
-                    {
-                        if (SelectedProject != null && SelectedProject.FilePath == e.ProjectFilePath)
-                        {
-                            Documents?.OnChange(e);
-                        }
-
-                        break;
-                    }
-            }
-        }
-
-        private void OnSelectedProjectChanged()
-        {
-            if (SelectedProject == null)
-            {
-                ProjectProperties = null;
-                Directives = null;
-                Documents = null;
-                TagHelpers = null;
-
-                return;
-            }
-
-            var project = _projectManager.GetLoadedProject(_selectedProject.FilePath);
-            ProjectProperties = new ProjectPropertyCollectionViewModel(project);
-            Directives = new DirectiveCollectionViewModel(project);
-            Documents = new DocumentCollectionViewModel(_projectManager, project, _errorHandler);
-            TagHelpers = new TagHelperCollectionViewModel(project, _errorHandler);
-        }
-
-        private bool CanExecuteUpdate(object state)
-        {
-            return SelectedProject != null;
-        }
-
-        private void ExecuteUpdate(object state)
-        {
-            var projectFilePath = SelectedProject?.FilePath;
-            if (projectFilePath == null)
-            {
-                return;
-            }
-
-            var project = _projectManager.GetLoadedProject(projectFilePath);
-            if (project != null && project.WorkspaceProject != null)
-            {
-                var solution = _workspace.CurrentSolution;
-                var workspaceProject = solution.GetProject(project.WorkspaceProject.Id);
-                if (workspaceProject != null)
-                {
-                    ((ProjectSnapshotManagerBase)_projectManager).WorkspaceProjectChanged(workspaceProject);
-                }
-            }
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/TagHelperCollectionViewModel.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/TagHelperCollectionViewModel.cs
deleted file mode 100644
index 383c88786edb..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/TagHelperCollectionViewModel.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-
-using System;
-using System.Collections.ObjectModel;
-using System.Threading.Tasks;
-using System.Windows;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-
-namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
-{
-    public class TagHelperCollectionViewModel : NotifyPropertyChanged
-    {
-        private readonly ProjectSnapshot _project;
-        private readonly Action<Exception> _errorHandler;
-
-        private Visibility _progressVisibility;
-
-        internal TagHelperCollectionViewModel(ProjectSnapshot project, Action<Exception> errorHandler)
-        {
-            _project = project;
-            _errorHandler = errorHandler;
-
-            TagHelpers = new ObservableCollection<TagHelperItemViewModel>();
-            InitializeTagHelpers();
-        }
-
-        public ObservableCollection<TagHelperItemViewModel> TagHelpers { get; }
-
-        public Visibility ProgressVisibility
-        {
-            get => _progressVisibility;
-            set
-            {
-                _progressVisibility = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private async void InitializeTagHelpers()
-        {
-            ProgressVisibility = Visibility.Hidden;
-
-            try
-            {
-                if (!_project.TryGetTagHelpers(out var tagHelpers))
-                {
-                    ProgressVisibility = Visibility.Visible;
-                    tagHelpers = await _project.GetTagHelpersAsync();
-                    await Task.Delay(250); // Force a delay for the UI
-                }
-
-                foreach (var tagHelper in tagHelpers)
-                {
-                    TagHelpers.Add(new TagHelperItemViewModel(tagHelper));
-                }
-            }
-            catch (Exception ex)
-            {
-                _errorHandler(ex);
-            }
-            finally
-            {
-                ProgressVisibility = Visibility.Hidden;
-            }
-        }
-    }
-}
-
-#endif
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/TagHelperItemViewModel.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/TagHelperItemViewModel.cs
deleted file mode 100644
index 927122ba3a1e..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/TagHelperItemViewModel.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
-{
-    public class TagHelperItemViewModel : NotifyPropertyChanged
-    {
-        private readonly TagHelperDescriptor _tagHelper;
-
-        internal TagHelperItemViewModel(TagHelperDescriptor tagHelper)
-        {
-            _tagHelper = tagHelper;
-        }
-
-        public string AssemblyName => _tagHelper.AssemblyName;
-
-        public string TargetElement => string.Join(", ", _tagHelper.TagMatchingRules.Select(rule => rule.TagName));
-
-        public string TypeName => _tagHelper.GetTypeName();
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorPackage.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorPackage.cs
deleted file mode 100644
index ed2f86b71733..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorPackage.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Runtime.InteropServices;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-
-namespace Microsoft.VisualStudio.RazorExtension
-{
-    [PackageRegistration(UseManagedResourcesOnly = true)]
-    [AboutDialogInfo(PackageGuidString, "ASP.NET Core Razor Language Services", "#110", "#112", IconResourceID = "#400")]
-    [Guid(PackageGuidString)]
-    [ProvideMenuResource("Menus.ctmenu", 1)]
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-    [ProvideToolWindow(typeof(Microsoft.VisualStudio.RazorExtension.RazorInfo.RazorInfoToolWindow))]
-    [ProvideToolWindow(typeof(Microsoft.VisualStudio.RazorExtension.DocumentInfo.RazorDocumentInfoWindow))]
-#endif
-    public sealed class RazorPackage : Package
-    {
-        public const string PackageGuidString = "13b72f58-279e-49e0-a56d-296be02f0805";
-
-        private const string CSharpPackageIdString = "13c3bbb4-f18f-4111-9f54-a0fb010d9194";
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-
-            // We need to force the CSharp package to load. That's responsible for the initialization
-            // of the remote host client.
-            var shell = GetService(typeof(SVsShell)) as IVsShell;
-            if (shell == null)
-            {
-                return;
-            }
-
-            IVsPackage package = null;
-            var packageGuid = new Guid(CSharpPackageIdString);
-            shell.LoadPackage(ref packageGuid, out package);
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-            RazorInfo.RazorInfoToolWindowCommand.Initialize(this);
-            DocumentInfo.RazorDocumentInfoWindowCommand.Initialize(this);
-#endif
-        }
-    }
-}
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorPackage.vsct b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorPackage.vsct
deleted file mode 100644
index e421b6691e29..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RazorPackage.vsct
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-  <!--This is the file that defines the IDs for all the commands exposed by VisualStudio. -->
-  <Extern href="stdidcmd.h" />
-
-  <!--This header contains the command ids for the menus provided by the shell. -->
-  <Extern href="vsshlids.h" />
-
-  <Commands package="guidRazorPackage">
-    <Buttons>
-      <Button guid="guidRazorPackageCmdSet" id="cmdidRazorInfoToolWindow" priority="0x0100" type="Button">
-        <Parent guid="guidSHLMainMenu" id="IDG_VS_WNDO_OTRWNDWS1" />
-        <Icon guid="guidImages" id="bmpPic1" />
-        <Strings>
-          <ButtonText>Razor Diagnostics</ButtonText>
-        </Strings>
-      </Button>
-      <Button guid="guidRazorPackageCmdSet" id="cmdidRazorDocumentInfoWindow" priority="0x0100" type="Button">
-        <Parent guid="guidSHLMainMenu" id="IDG_VS_WNDO_OTRWNDWS1" />
-        <Icon guid="guidImages" id="bmpPic1" />
-        <Strings>
-          <ButtonText>Razor Document Info</ButtonText>
-        </Strings>
-      </Button>
-    </Buttons>
-
-    <Bitmaps>
-      <Bitmap guid="guidImages" href="Resources\RazorInfoToolWindowCommand.png" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows, bmpPicStrikethrough" />
-    </Bitmaps>
-  </Commands>
-
-  <Symbols>
-    <GuidSymbol name="guidRazorPackage" value="{13b72f58-279e-49e0-a56d-296be02f0805}" />
-
-    <GuidSymbol name="guidRazorPackageCmdSet" value="{eaaf8ee4-d120-4a4d-8b58-b138b7f00b96}">
-      <IDSymbol name="cmdidRazorInfoToolWindow" value="0x0100" />
-      <IDSymbol name="cmdidRazorDocumentInfoWindow" value="0x101"  />
-    </GuidSymbol>
-
-    <GuidSymbol name="guidImages" value="{9dfcb7a0-bfd4-4081-845e-a67a274f7cba}">
-      <IDSymbol name="bmpPic1" value="1" />
-      <IDSymbol name="bmpPic2" value="2" />
-      <IDSymbol name="bmpPicSearch" value="3" />
-      <IDSymbol name="bmpPicX" value="4" />
-      <IDSymbol name="bmpPicArrows" value="5" />
-      <IDSymbol name="bmpPicStrikethrough" value="6" />
-    </GuidSymbol>
-
-  </Symbols>
-</CommandTable>
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RelayCommand.cs b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RelayCommand.cs
deleted file mode 100644
index cf6db15da921..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/RelayCommand.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if RAZOR_EXTENSION_DEVELOPER_MODE
-using System;
-using System.Windows.Input;
-
-namespace Microsoft.VisualStudio.RazorExtension
-{
-    public class RelayCommand<T> : ICommand
-    {
-        readonly Action<T> _execute = null;
-        readonly Predicate<T> _canExecute = null;
-
-        public RelayCommand(Action<T> execute)
-            : this(execute, null)
-        {
-        }
-
-        public RelayCommand(Action<T> execute, Predicate<T> canExecute)
-        {
-            if (execute == null)
-                throw new ArgumentNullException("execute");
-
-            _execute = execute;
-            _canExecute = canExecute;
-        }
-
-        public bool CanExecute(object parameter)
-        {
-            return _canExecute == null ? true : _canExecute((T)parameter);
-        }
-
-        public event EventHandler CanExecuteChanged
-        {
-            add { CommandManager.RequerySuggested += value; }
-            remove { CommandManager.RequerySuggested -= value; }
-        }
-
-        public void Execute(object parameter)
-        {
-            _execute((T)parameter);
-        }
-    }
-}
-#endif
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Resources/RazorInfoToolWindowCommand.png b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Resources/RazorInfoToolWindowCommand.png
deleted file mode 100644
index b22d975cbf00..000000000000
Binary files a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Resources/RazorInfoToolWindowCommand.png and /dev/null differ
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Resources/RazorPackage.ico b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Resources/RazorPackage.ico
deleted file mode 100644
index d323b07fb8d8..000000000000
Binary files a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Resources/RazorPackage.ico and /dev/null differ
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/VSPackage.resx b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/VSPackage.resx
deleted file mode 100644
index f46d3bd27d5a..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/VSPackage.resx
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="110" xml:space="preserve">
-    <value>ASP.NET Core Razor Language Services</value>
-  </data>
-  <data name="112" xml:space="preserve">
-    <value>Provides languages services for ASP.NET Core Razor.</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\RazorPackage.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/WebConfiguration.png b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/WebConfiguration.png
deleted file mode 100644
index 60615f65316d..000000000000
Binary files a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/WebConfiguration.png and /dev/null differ
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/razorLanguageService.servicehub.service.json b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/razorLanguageService.servicehub.service.json
deleted file mode 100644
index ff6cba6c6c82..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/razorLanguageService.servicehub.service.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "host": "desktopClr.x86",
-  "hostId": "RoslynCodeAnalysisService32",
-  "hostGroupAllowed": true,
-  "entryPoint": {
-    "assemblyPath": "Microsoft.CodeAnalysis.Remote.Razor.dll",
-    "fullClassName": "Microsoft.CodeAnalysis.Remote.Razor.RazorLanguageService",
-    "appBasePath": "%VSAPPIDDIR%",
-    "configPath": "%PkgDefApplicationConfigFile%"
-  }
-}
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/razorLanguageService64.servicehub.service.json b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/razorLanguageService64.servicehub.service.json
deleted file mode 100644
index b4217084bd28..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/razorLanguageService64.servicehub.service.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "host": "desktopClr",
-  "hostId": "RoslynCodeAnalysisService",
-  "hostGroupAllowed": true,
-  "entryPoint": {
-    "assemblyPath": "Microsoft.CodeAnalysis.Remote.Razor.dll",
-    "fullClassName": "Microsoft.CodeAnalysis.Remote.Razor.RazorLanguageService",
-    "appBasePath": "%VSAPPIDDIR%",
-    "configPath": "%PkgDefApplicationConfigFile%"
-  }
-}
\ No newline at end of file
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/source.extension.vsixmanifest b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/source.extension.vsixmanifest
deleted file mode 100644
index 253dcc8b706f..000000000000
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/source.extension.vsixmanifest
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-  <Metadata>
-    <Identity Id="Microsoft.VisualStudio.RazorExtension" Version="|%CurrentProject%;GetBuildVersion|" Language="en-US" Publisher="Microsoft" />
-    <DisplayName>Razor Language Services</DisplayName>
-    <Description xml:space="preserve">Language services for ASP.NET Core Razor</Description>
-    <Icon>WebConfiguration.png</Icon>
-    <PreviewIcon>WebConfiguration.png</PreviewIcon>
-    <PackageId>Microsoft.VisualStudio.RazorExtension</PackageId>
-  </Metadata>
-  <Installation AllUsers="true">
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0.26228.04,)" />
-  </Installation>
-  <Dependencies>
-    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
-    <Dependency Id="Microsoft.VisualStudio.MPF.15.0" DisplayName="Visual Studio MPF 15.0" d:Source="Installed" Version="[15.0]" />
-  </Dependencies>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
-    <Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[15.0,16.0)" DisplayName="Roslyn Language Services" />
-  </Prerequisites>
-  <Assets>
-    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
-    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="razorLanguageService.servicehub.service.json" />
-    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="razorLanguageService64.servicehub.service.json" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.AspNetCore.Razor.Language.dll" />
-    <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.AspNetCore.Razor.Language.dll" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.CodeAnalysis.Razor.dll" />
-    <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.Razor.dll" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.CodeAnalysis.Razor.Workspaces.dll" />
-    <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.Razor.Workspaces.dll" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.CodeAnalysis.Remote.Razor.dll" />
-    <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.Remote.Razor.dll" />
-    <Asset Type="Microsoft.VisualStudio.Assembly"  Path="Microsoft.VisualStudio.LanguageServices.Razor.dll" />
-    <Asset Type="Microsoft.VisualStudio.MefComponent"  Path="Microsoft.VisualStudio.LanguageServices.Razor.dll" />
-    <Asset Type="Microsoft.VisualStudio.Assembly"  Path="Microsoft.VisualStudio.Editor.Razor.dll" />
-    <Asset Type="Microsoft.VisualStudio.MefComponent"  Path="Microsoft.VisualStudio.Editor.Razor.dll" />
-  </Assets>
-</PackageManifest>