From 2cb52f06b229b4c92e6429eeb621608fa1fcfdb1 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 11 Aug 2020 21:19:18 -0700
Subject: [PATCH] Update branding to 2.1.22

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

diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 11119cef2fcc..0060a1c36124 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.1.20</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.1.21</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: dotnet-dev-certs-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -477,13 +477,13 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Http.Extensions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Extensions' ">
-    <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
+    <BaselinePackageVersion>2.1.21</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Extensions' AND '$(TargetFramework)' == 'netstandard2.0' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="[2.1.1, )" />
-    <BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="[2.1.1, )" />
-    <BaselinePackageReference Include="System.Buffers" Version="[4.5.0, )" />
+    <BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="System.Buffers" Version="[4.5.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Http.Features-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Features' ">
@@ -859,7 +859,7 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.ResponseCompression-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' ">
-    <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
+    <BaselinePackageVersion>2.1.21</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' AND '$(TargetFramework)' == 'net461' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 398381dcad0e..ce240e5f6944 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.20">
+<Baseline Version="2.1.21">
   <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" />
@@ -54,7 +54,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="1.0.4" />
   <Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="1.0.4" />
   <Package Id="Microsoft.AspNetCore.Http.Connections" Version="1.0.15" />
-  <Package Id="Microsoft.AspNetCore.Http.Extensions" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.Http.Extensions" Version="2.1.21" />
   <Package Id="Microsoft.AspNetCore.Http.Features" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Http" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.HttpOverrides" Version="2.1.1" />
@@ -93,7 +93,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.Razor" Version="2.1.2" />
   <Package Id="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.ResponseCaching" Version="2.1.1" />
-  <Package Id="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.ResponseCompression" Version="2.1.21" />
   <Package Id="Microsoft.AspNetCore.Rewrite" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Routing.Abstractions" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Routing" Version="2.1.1" />
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 6f17fb8dec12..40c0413b43b3 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -72,4 +72,8 @@ Later on, this will be checked using this condition:
       Microsoft.AspNetCore.ResponseCompression;
     </PackagesInPatch>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.22' ">
+    <PackagesInPatch>
+    </PackagesInPatch>
+  </PropertyGroup>
 </Project>
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.21.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.21.txt
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.21.txt
@@ -0,0 +1 @@
+
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.21.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.21.txt
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.21.txt
@@ -0,0 +1 @@
+
diff --git a/version.props b/version.props
index e0df5c7e110c..684ab9f01130 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>21</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>22</AspNetCorePatchVersion>
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
     <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>