From 26365e78398b60805c1f3f9c602a12b2897b3534 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Wed, 20 May 2020 13:40:46 -0700
Subject: [PATCH] Update branding (#22046)

---
 eng/Baseline.Designer.props | 6 +++---
 eng/Baseline.xml            | 4 ++--
 eng/PatchConfig.props       | 4 ++++
 version.props               | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 3ff7443158..45e64d60af 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.1.17</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.1.18</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: dotnet-dev-certs-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -658,11 +658,11 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Mvc.Formatters.Json-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Formatters.Json' ">
-    <BaselinePackageVersion>2.1.3</BaselinePackageVersion>
+    <BaselinePackageVersion>2.1.18</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Formatters.Json' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.1.3, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.1.3, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Mvc.Formatters.Xml-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Formatters.Xml' ">
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 743a85e00e..8344a8e586 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.17">
+<Baseline Version="2.1.18">
   <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" />
@@ -73,7 +73,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.Mvc.Core" Version="2.1.16" />
   <Package Id="Microsoft.AspNetCore.Mvc.Cors" Version="2.1.3" />
   <Package Id="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.1.3" />
-  <Package Id="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.1.3" />
+  <Package Id="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.1.18" />
   <Package Id="Microsoft.AspNetCore.Mvc.Formatters.Xml" Version="2.1.3" />
   <Package Id="Microsoft.AspNetCore.Mvc.Localization" Version="2.1.3" />
   <Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.1.2" />
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 4e0ba9c955..45de9044c3 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -65,4 +65,8 @@ Later on, this will be checked using this condition:
       Microsoft.AspNetCore.Mvc.Formatters.Json;
     </PackagesInPatch>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.19' ">
+    <PackagesInPatch>
+    </PackagesInPatch>
+  </PropertyGroup>
 </Project>
diff --git a/version.props b/version.props
index db42b69012..061d552d88 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>18</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>19</AspNetCorePatchVersion>
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
     <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>