diff --git a/build/submodules.props b/build/submodules.props
index a088430493..4370c412c7 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -37,6 +37,6 @@
 
   <ItemGroup>
     <Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\Templating\" />
-    <Repository Include="EntityFrameworkCore" />
+    <ShippedRepository Include="EntityFrameworkCore" />
   </ItemGroup>
 </Project>
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index fca94be07c..14f2dfd4bc 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.1.7</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.1.8</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: dotnet-dev-certs-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -120,7 +120,7 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.Google-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Google' ">
-    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+    <BaselinePackageVersion>2.1.8</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Google' AND '$(TargetFramework)' == 'netstandard2.0' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.1.2, )" />
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index adc7afcb87..01f155f88e 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele
 build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
 
 -->
-<Baseline Version="2.1.7">
+<Baseline Version="2.1.8">
   <Package Id="dotnet-dev-certs" Version="2.1.1" />
   <Package Id="dotnet-sql-cache" Version="2.1.1" />
   <Package Id="dotnet-user-secrets" Version="2.1.1" />
@@ -17,7 +17,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.2" />
   <Package Id="Microsoft.AspNetCore.Authentication.Core" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="2.1.2" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Google" Version="2.1.2" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Google" Version="2.1.8" />
   <Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
   <Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="2.1.2" />
   <Package Id="Microsoft.AspNetCore.Authentication.OAuth" Version="2.1.2" />
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 0a6db36788..70a6297f74 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -19,4 +19,8 @@ Later on, this will be checked using this condition:
     </PackagesInPatch>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.9' ">
+    <PackagesInPatch>
+    </PackagesInPatch>
+  </PropertyGroup>
 </Project>
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.8.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.8.txt
new file mode 100644
index 0000000000..d24b04eefb
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.8.txt
@@ -0,0 +1,5 @@
+microsoft.aspnetcore.razor.design\2.1.1\.nupkg.metadata
+system.buffers\4.3.0\.signature.p7s
+system.collections.immutable\1.3.0\.signature.p7s
+system.diagnostics.contracts\4.3.0\.signature.p7s
+system.runtime.serialization.primitives\4.1.1\.signature.p7s
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.8.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.8.txt
new file mode 100644
index 0000000000..d24b04eefb
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.8.txt
@@ -0,0 +1,5 @@
+microsoft.aspnetcore.razor.design\2.1.1\.nupkg.metadata
+system.buffers\4.3.0\.signature.p7s
+system.collections.immutable\1.3.0\.signature.p7s
+system.diagnostics.contracts\4.3.0\.signature.p7s
+system.runtime.serialization.primitives\4.1.1\.signature.p7s
diff --git a/version.props b/version.props
index 94a3f4ccb9..c696d687f3 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>8</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>9</AspNetCorePatchVersion>
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
     <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>