From 82c42d58aeb401968c2dcd779c99fc503935052c Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Sun, 22 Sep 2019 16:07:53 -0700
Subject: [PATCH] Update branding to 2.1.14 - aspnet/AspNetCore-Internal#3153

---
 eng/Baseline.Designer.props                          |  9 +++++----
 eng/Baseline.xml                                     |  6 +++---
 eng/PatchConfig.props                                | 12 ++++--------
 .../ArchiveBaseline.2.1.13.txt                       |  1 +
 .../ArchiveBaseline.2.1.13.txt                       |  1 +
 version.props                                        |  2 +-
 6 files changed, 15 insertions(+), 16 deletions(-)
 create mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.13.txt
 create mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.13.txt

diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index a830a66044..c82f441f14 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.1.12</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.1.13</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: dotnet-dev-certs-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -284,10 +284,11 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.DataProtection.AzureStorage-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.AzureStorage' ">
-    <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
+    <BaselinePackageVersion>2.1.13</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.AzureStorage' AND '$(TargetFramework)' == 'netstandard2.0' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Data.OData" Version="[5.8.4, )" />
     <BaselinePackageReference Include="WindowsAzure.Storage" Version="[8.1.4, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.DataProtection.Extensions-->
@@ -1117,12 +1118,12 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SpaServices-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices' ">
-    <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
+    <BaselinePackageVersion>2.1.13</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.NodeServices" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.NodeServices" Version="[2.1.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.StaticFiles-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.StaticFiles' ">
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index dff0b069c0..8ab070f7e9 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.12">
+<Baseline Version="2.1.13">
   <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" />
@@ -36,7 +36,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="2.1.1" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.1.13" />
   <Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.DataProtection.Redis" Version="0.4.1" />
   <Package Id="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.1.1" />
@@ -115,7 +115,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.SignalR.Redis" Version="1.0.11" />
   <Package Id="Microsoft.AspNetCore.SignalR" Version="1.0.4" />
   <Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.1.1" />
-  <Package Id="Microsoft.AspNetCore.SpaServices" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.SpaServices" Version="2.1.13" />
   <Package Id="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.WebSockets" Version="2.1.7" />
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index e433208e89..71ff8312fd 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -18,14 +18,6 @@ Later on, this will be checked using this condition:
       Microsoft.AspNetCore.Authentication.Google;
     </PackagesInPatch>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.9' ">
-    <PackagesInPatch>
-    </PackagesInPatch>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.10' ">
-    <PackagesInPatch>
-    </PackagesInPatch>
-  </PropertyGroup>
   <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.11' ">
     <PackagesInPatch>
       Microsoft.AspNetCore.Identity.UI;
@@ -46,4 +38,8 @@ Later on, this will be checked using this condition:
       Microsoft.AspNetCore.SpaServices;
     </PackagesInPatch>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.14' ">
+    <PackagesInPatch>
+    </PackagesInPatch>
+  </PropertyGroup>
 </Project>
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.13.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.13.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.13.txt
@@ -0,0 +1 @@
+
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.13.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.13.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.13.txt
@@ -0,0 +1 @@
+
diff --git a/version.props b/version.props
index e65ef23479..ed48958394 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>13</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>14</AspNetCorePatchVersion>
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
     <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>