From 147f950686f9f3201be8a2913e811fb4d8d338cf Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Wed, 20 Nov 2019 17:10:59 -0800
Subject: [PATCH] Update branding to 2.1.15 (#17273)

---
 build/submodules.props                                      | 2 +-
 eng/Baseline.Designer.props                                 | 6 +++---
 eng/Baseline.xml                                            | 6 +++---
 eng/PatchConfig.props                                       | 4 ++++
 .../ArchiveBaseline.2.1.14.txt                              | 1 +
 .../Archive.CiServer.Patch/ArchiveBaseline.2.1.14.txt       | 1 +
 version.props                                               | 2 +-
 7 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.14.txt
 create mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.14.txt

diff --git a/build/submodules.props b/build/submodules.props
index a0884304938a..4370c412c719 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 c82f441f1423..29e2efcf98b8 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.1.13</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.1.14</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: dotnet-dev-certs-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -235,7 +235,7 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.CookiePolicy-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.CookiePolicy' ">
-    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+    <BaselinePackageVersion>2.1.14</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.CookiePolicy' AND '$(TargetFramework)' == 'netstandard2.0' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
@@ -1219,7 +1219,7 @@
   </ItemGroup>
   <!-- Package: Microsoft.Net.Http.Headers-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Http.Headers' ">
-    <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
+    <BaselinePackageVersion>2.1.14</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Http.Headers' AND '$(TargetFramework)' == 'netstandard2.0' ">
     <BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[2.1.1, )" />
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 8ab070f7e985..69761f4e1955 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.13">
+<Baseline Version="2.1.14">
   <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" />
@@ -30,7 +30,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.1.3" />
-  <Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.1.2" />
+  <Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.1.14" />
   <Package Id="Microsoft.AspNetCore.Cors" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" />
@@ -124,7 +124,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.CodeAnalysis.Razor" Version="2.1.2" />
   <Package Id="Microsoft.Extensions.Identity.Core" Version="2.1.6" />
   <Package Id="Microsoft.Extensions.Identity.Stores" Version="2.1.6" />
-  <Package Id="Microsoft.Net.Http.Headers" Version="2.1.1" />
+  <Package Id="Microsoft.Net.Http.Headers" Version="2.1.14" />
   <Package Id="Microsoft.Net.Sdk.Razor" Version="2.1.2" />
   <Package Id="Microsoft.Owin.Security.Interop" Version="2.1.2" />
 </Baseline>
\ No newline at end of file
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 3ba7babc5710..513d6f73b15c 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -44,4 +44,8 @@ Later on, this will be checked using this condition:
       Microsoft.AspNetCore.CookiePolicy;
     </PackagesInPatch>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.15' ">
+    <PackagesInPatch>
+    </PackagesInPatch>
+  </PropertyGroup>
 </Project>
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.14.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.14.txt
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.14.txt
@@ -0,0 +1 @@
+
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.14.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.14.txt
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.14.txt
@@ -0,0 +1 @@
+
diff --git a/version.props b/version.props
index ed4895839464..6f78c654d6ca 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>14</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>15</AspNetCorePatchVersion>
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
     <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>