diff --git a/build/artifacts.props b/build/artifacts.props
index 64b982b1fa..c909b76092 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -56,6 +56,8 @@
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Formatters.Json" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Localization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" Category="shipoob" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Razor" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.RazorPages" AllMetapackage="true" AppMetapackage="true" Category="ship" />
@@ -64,6 +66,11 @@
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.ViewFeatures" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Razor.Design" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Razor.Language" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Razor.Runtime" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Razor" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Core" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Https" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
@@ -78,6 +85,9 @@
     <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Redis" AllMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.SignalR" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.CodeAnalysis.Razor.Workspaces" Category="shipoob" />
+    <PackageArtifact Include="Microsoft.CodeAnalysis.Razor" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.CodeAnalysis.Remote.Razor" Category="shipoob" />
     <PackageArtifact Include="Microsoft.DotNet.Web.Client.ItemTemplates" Category="shipoob" />
     <PackageArtifact Include="Microsoft.DotNet.Web.ItemTemplates" Category="shipoob" />
     <PackageArtifact Include="Microsoft.DotNet.Web.ProjectTemplates.2.1" Category="shipoob" />
@@ -96,7 +106,11 @@
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.SqlServer" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Tools" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.EntityFrameworkCore" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.NET.Sdk.Razor" Category="ship" />
     <PackageArtifact Include="Microsoft.Owin.Security.Interop" Category="ship" />
+    <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" LZMA="true" Category="ship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Core" LZMA="true" Category="ship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" LZMA="true" Category="ship" />
@@ -105,5 +119,6 @@
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Utils" LZMA="true" Category="ship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration" LZMA="true" Category="ship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" LZMA="true" Category="ship" />
+    <PackageArtifact Include="RazorPageGenerator" Category="noship" />
   </ItemGroup>
 </Project>
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index c68edeccd3..a959419737 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -224,18 +224,11 @@
     <ExternalDependency Include="Microsoft.AspNetCore.Localization.Routing" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.AspNetCore.Localization" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" Version="2.1.0" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.AspNetCore.NodeServices.Sockets" Version="2.1.0" Category="noship" />
     <ExternalDependency Include="Microsoft.AspNetCore.NodeServices" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.AspNetCore.Owin" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.AspNetCore.Proxy" Version="0.3.0" Category="noship" />
     <ExternalDependency Include="Microsoft.AspNetCore.RangeHelper.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Razor.Language" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Razor.Runtime" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Razor" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.AspNetCore.ResponseCaching" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.AspNetCore.ResponseCompression" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
@@ -270,9 +263,6 @@
     <ExternalDependency Include="Microsoft.AspNetCore.WebSockets" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.AspNetCore.WebUtilities" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.AspNetCore" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.CodeAnalysis.Razor.Workspaces" Version="2.1.0" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.CodeAnalysis.Razor" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.CodeAnalysis.Remote.Razor" Version="2.1.0" Category="shipoob" />
     <ExternalDependency Include="Microsoft.Data.Sqlite.Core" Version="2.1.0" AllMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.Data.Sqlite" Version="2.1.0" AllMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="2.1.0" Category="noship" />
@@ -346,13 +336,8 @@
     <ExternalDependency Include="Microsoft.Extensions.WebEncoders.Sources" Version="2.1.0" Category="noship" />
     <ExternalDependency Include="Microsoft.Extensions.WebEncoders" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.Net.Http.Headers" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.NET.Sdk.Razor" Version="2.1.0" Category="ship" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Editor.Razor" Version="2.1.0" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.VisualStudio.LanguageServices.Razor" Version="2.1.0" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Mac.LanguageServices.Razor" Version="2.1.0" Category="shipoob" />
     <ExternalDependency Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.0" AllMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.Web.Xdt.Extensions" Version="2.1.0" Category="shipoob" />
-    <ExternalDependency Include="RazorPageGenerator" Version="2.1.0" Category="noship" />
   </ItemGroup>
 
 </Project>
diff --git a/build/submodules.props b/build/submodules.props
index 5a3cc32ed7..ef347053ef 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -10,6 +10,7 @@
     <Repository Include="KestrelHttpServer" />
     <Repository Include="Mvc" />
     <Repository Include="MvcPrecompilation" />
+    <Repository Include="Razor" />
     <Repository Include="Scaffolding" />
     <Repository Include="Security" />
     <Repository Include="SignalR" />
@@ -48,7 +49,6 @@
     <ShippedRepository Include="MusicStore" />
     <ShippedRepository Include="Options" />
     <ShippedRepository Include="Proxy" />
-    <ShippedRepository Include="Razor" />
     <ShippedRepository Include="ResponseCaching" />
     <ShippedRepository Include="Routing" />
     <ShippedRepository Include="ServerTests" />