From 183a09f763074c8383987d652fd457bb19a6f62f Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Tue, 14 Jan 2020 14:42:47 -0800
Subject: [PATCH] Update branding to 2.1.16

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

diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 4ca09124b6..67c142aadd 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.1.14</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.1.15</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: dotnet-dev-certs-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -453,23 +453,23 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Http.Connections-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections' ">
-    <BaselinePackageVersion>1.0.4</BaselinePackageVersion>
+    <BaselinePackageVersion>1.0.15</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections' AND '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[1.0.4, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization.Policy" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[1.0.4, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Routing" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.WebSockets" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" />
     <BaselinePackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="[4.5.3, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[1.0.4, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization.Policy" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[1.0.4, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Routing" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.WebSockets" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" />
@@ -1063,12 +1063,12 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Core-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Core' ">
-    <BaselinePackageVersion>1.0.4</BaselinePackageVersion>
+    <BaselinePackageVersion>1.0.15</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Core' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[1.0.4, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[1.0.4, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
     <BaselinePackageReference Include="System.Reflection.Emit" Version="[4.3.0, )" />
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 69761f4e19..af6f6eaf27 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.14">
+<Baseline Version="2.1.15">
   <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" />
@@ -53,7 +53,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
   <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.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.Features" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Http" Version="2.1.1" />
@@ -109,7 +109,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="1.0.4" />
   <Package Id="Microsoft.AspNetCore.SignalR.Client" Version="1.0.4" />
   <Package Id="Microsoft.AspNetCore.SignalR.Common" Version="1.0.4" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Core" Version="1.0.4" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Core" Version="1.0.15" />
   <Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="1.0.4" />
   <Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="1.0.11" />
   <Package Id="Microsoft.AspNetCore.SignalR.Redis" Version="1.0.11" />
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 48bab5aea1..b4ea70ab0a 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -44,7 +44,7 @@ Later on, this will be checked using this condition:
       Microsoft.AspNetCore.CookiePolicy;
     </PackagesInPatch>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.15' ">
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.16' ">
     <PackagesInPatch>
       Microsoft.AspNetCore.Http.Connections;
       Microsoft.AspNetCore.SignalR.Core;
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.15.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.15.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.15.txt
@@ -0,0 +1 @@
+
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.15.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.15.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.15.txt
@@ -0,0 +1 @@
+
diff --git a/version.props b/version.props
index 6f78c654d6..aede0b4113 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>15</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>16</AspNetCorePatchVersion>
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
     <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>