diff --git a/build/artifacts.props b/build/artifacts.props
index a74b8600ac..545a84bb73 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -26,6 +26,7 @@
     <PackageArtifact Include="dotnet-watch" Category="ship" />
     <PackageArtifact Include="Internal.AspNetCore.Analyzers" Category="noship" />
     <PackageArtifact Include="Internal.AspNetCore.Universe.Lineup" Category="noship" PackageType="Lineup" />
+    <PackageArtifact Include="Internal.WebHostBuilderFactory.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.All" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Analyzer.Testing" Category="noship" />
@@ -79,7 +80,6 @@
     <PackageArtifact Include="Microsoft.AspNetCore.HostFiltering" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Hosting.Abstractions" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
-    <PackageArtifact Include="Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Hosting.WindowsServices" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Hosting" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Html.Abstractions" Category="ship" AppMetapackage="true" AllMetapackage="true" />
diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore
index 2d1767e767..5c8600e440 160000
--- a/modules/EntityFrameworkCore
+++ b/modules/EntityFrameworkCore
@@ -1 +1 @@
-Subproject commit 2d1767e767a8446d3ed5ae6adbc9c55d6c7823d2
+Subproject commit 5c8600e440498e992a7fc3c02d447534fc146334
diff --git a/modules/Hosting b/modules/Hosting
index c8718c1c56..c4e8dd3664 160000
--- a/modules/Hosting
+++ b/modules/Hosting
@@ -1 +1 @@
-Subproject commit c8718c1c56e82073e0271144b7e704dd3abcf717
+Subproject commit c4e8dd3664d1860985bc7d98f74d3dc355b2df7e