From cb4e0cef8b84e7224ab77ff3c6a85edd23005fc2 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Tue, 14 Jul 2020 15:22:10 -0700
Subject: [PATCH] Update branding to 2.1.21 (#23920)

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

diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 1622fa704135..11119cef2fcc 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.1.19</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.1.20</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: dotnet-dev-certs-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 7497e78a7ba4..398381dcad0e 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.19">
+<Baseline Version="2.1.20">
   <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" />
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index aefa226d1519..3eb4d105ba43 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -66,4 +66,8 @@ Later on, this will be checked using this condition:
       @aspnet/signalr;
     </PackagesInPatch>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.21' ">
+    <PackagesInPatch>
+    </PackagesInPatch>
+  </PropertyGroup>
 </Project>
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.20.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.20.txt
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.20.txt
@@ -0,0 +1 @@
+
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.20.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.20.txt
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.20.txt
@@ -0,0 +1 @@
+
diff --git a/version.props b/version.props
index 8a787e0583ab..e0df5c7e110c 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>20</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>21</AspNetCorePatchVersion>
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
     <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>