From c41cd63942eb6dc8e6715b169d3a595acd1a8ce5 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Fri, 14 Feb 2020 12:21:22 -0800
Subject: [PATCH 1/4] Update branding to 2.1.17 (#19045)

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

diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 67c142aadd..888c5fa219 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.1.15</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.1.16</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: dotnet-dev-certs-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index af6f6eaf27..82e0aadeea 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.15">
+<Baseline Version="2.1.16">
   <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 af801ea8db..87040c9a5e 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -56,4 +56,8 @@ Later on, this will be checked using this condition:
       Microsoft.AspNetCore.Mvc.Core;
     </PackagesInPatch>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.17' ">
+    <PackagesInPatch>
+    </PackagesInPatch>
+  </PropertyGroup>
 </Project>
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.16.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.16.txt
new file mode 100644
index 0000000000..488c50fa82
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.16.txt
@@ -0,0 +1,19 @@
+runtime.native.system.net.security\4.3.0\.signature.p7s
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\4.3.0\.signature.p7s
+runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
+runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
+runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
+runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
+system.composition.attributedmodel\1.0.31\.signature.p7s
+system.composition.runtime\1.0.31\.signature.p7s
+system.reflection.emit.ilgeneration\4.3.0\.signature.p7s
+system.reflection.emit.lightweight\4.3.0\.signature.p7s
+system.reflection.typeextensions\4.3.0\.signature.p7s
+system.runtime.serialization.json\4.0.2\.signature.p7s
+system.runtime.serialization.primitives\4.3.0\.signature.p7s
+system.security.cryptography.cng\4.3.0\.signature.p7s
+system.security.cryptography.openssl\4.3.0\.signature.p7s
+system.security.principal\4.3.0\.signature.p7s
+system.text.encoding.codepages\4.3.0\.signature.p7s
+system.xml.xpath.xdocument\4.3.0\.signature.p7s
+system.xml.xpath\4.3.0\.signature.p7s
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.16.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.16.txt
new file mode 100644
index 0000000000..488c50fa82
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.16.txt
@@ -0,0 +1,19 @@
+runtime.native.system.net.security\4.3.0\.signature.p7s
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\4.3.0\.signature.p7s
+runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
+runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
+runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
+runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
+system.composition.attributedmodel\1.0.31\.signature.p7s
+system.composition.runtime\1.0.31\.signature.p7s
+system.reflection.emit.ilgeneration\4.3.0\.signature.p7s
+system.reflection.emit.lightweight\4.3.0\.signature.p7s
+system.reflection.typeextensions\4.3.0\.signature.p7s
+system.runtime.serialization.json\4.0.2\.signature.p7s
+system.runtime.serialization.primitives\4.3.0\.signature.p7s
+system.security.cryptography.cng\4.3.0\.signature.p7s
+system.security.cryptography.openssl\4.3.0\.signature.p7s
+system.security.principal\4.3.0\.signature.p7s
+system.text.encoding.codepages\4.3.0\.signature.p7s
+system.xml.xpath.xdocument\4.3.0\.signature.p7s
+system.xml.xpath\4.3.0\.signature.p7s
diff --git a/version.props b/version.props
index aede0b4113..9db8231048 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>16</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>17</AspNetCorePatchVersion>
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
     <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>

From 5313b14479b6ca9a1a3fdea3debef5c19bd8e5ce Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Tue, 18 Feb 2020 16:28:50 -0800
Subject: [PATCH 2/4] Update branding to 2.1.17 part 2 (#19127)

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

diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 888c5fa219..6f84c57d54 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -97,7 +97,7 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.Cookies-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Cookies' ">
-    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+    <BaselinePackageVersion>2.1.16</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Cookies' AND '$(TargetFramework)' == 'netstandard2.0' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication" Version="[2.1.2, )" />
@@ -621,7 +621,7 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Mvc.Core-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Core' ">
-    <BaselinePackageVersion>2.1.11</BaselinePackageVersion>
+    <BaselinePackageVersion>2.1.16</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Core' AND '$(TargetFramework)' == 'netstandard2.0' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.1.1, )" />
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 82e0aadeea..b73b3f92d7 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -14,7 +14,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="2.1.1" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.2" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.16" />
   <Package Id="Microsoft.AspNetCore.Authentication.Core" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="2.1.2" />
   <Package Id="Microsoft.AspNetCore.Authentication.Google" Version="2.1.8" />
@@ -70,7 +70,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.3" />
   <Package Id="Microsoft.AspNetCore.Mvc.Analyzers" Version="2.1.3" />
   <Package Id="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="2.1.3" />
-  <Package Id="Microsoft.AspNetCore.Mvc.Core" Version="2.1.11" />
+  <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" />

From c0e2848ec1ff9280c2a03cfb6eb696bf596215bd Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 19 Feb 2020 15:11:14 -0800
Subject: [PATCH 3/4] Pin and unpin packages for 2.1.17

---
 build/dependencies.props | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index aa8383b323..ebac4629ca 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -4,7 +4,10 @@
     <!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
     <MicrosoftNETCoreAppPackageVersion>2.1.12</MicrosoftNETCoreAppPackageVersion>
     <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.12</MicrosoftNETCoreDotNetAppHostPackageVersion>
-    <SystemDataSqlClientPackageVersion>4.5.1</SystemDataSqlClientPackageVersion>
+    <SystemBuffersPackageVersion>4.5.0</SystemBuffersPackageVersion>
+    <SystemMemoryPackageVersion>4.5.3</SystemMemoryPackageVersion>
+    <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.2</SystemRuntimeCompilerServicesUnsafePackageVersion>
+    <SystemThreadingTasksExtensionsPackageVersion>4.5.2</SystemThreadingTasksExtensionsPackageVersion>
   </PropertyGroup>
 
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
@@ -181,22 +184,20 @@
     <StackExchangeRedisStrongNamePackageVersion>1.2.6</StackExchangeRedisStrongNamePackageVersion>
     <StreamJsonRpcPackageVersion>1.1.92</StreamJsonRpcPackageVersion>
     <StyleCopAnalyzersPackageVersion>1.0.0</StyleCopAnalyzersPackageVersion>
-    <SystemBuffersPackageVersion>4.5.0</SystemBuffersPackageVersion>
     <SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
     <SystemComponentModelAnnotationsPackageVersion>4.5.0</SystemComponentModelAnnotationsPackageVersion>
+    <SystemDataSqlClientPackageVersion>4.5.3</SystemDataSqlClientPackageVersion>
     <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
     <SystemDiagnosticsEventLogPackageVersion>4.5.0</SystemDiagnosticsEventLogPackageVersion>
     <SystemIdentityModelTokensJwtPackageVersion>5.2.0</SystemIdentityModelTokensJwtPackageVersion>
     <SystemInteractiveAsyncPackageVersion>3.1.1</SystemInteractiveAsyncPackageVersion>
     <SystemIOPipelinesPackageVersion>4.5.3</SystemIOPipelinesPackageVersion>
-    <SystemMemoryPackageVersion>4.5.3</SystemMemoryPackageVersion>
     <SystemNetHttpPackageVersion>4.3.4</SystemNetHttpPackageVersion>
     <SystemNetHttpWinHttpHandlerPackageVersion>4.5.3</SystemNetHttpWinHttpHandlerPackageVersion>
     <SystemNumericsVectorsPackageVersion>4.5.0</SystemNumericsVectorsPackageVersion>
     <SystemReactiveLinqPackageVersion>3.1.1</SystemReactiveLinqPackageVersion>
     <SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion>
     <SystemReflectionMetadataPackageVersion>1.6.0</SystemReflectionMetadataPackageVersion>
-    <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.2</SystemRuntimeCompilerServicesUnsafePackageVersion>
     <SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion>
     <SystemSecurityCryptographyCngPackageVersion>4.5.2</SystemSecurityCryptographyCngPackageVersion>
     <SystemSecurityCryptographyXmlPackageVersion>4.5.0</SystemSecurityCryptographyXmlPackageVersion>
@@ -206,7 +207,6 @@
     <SystemTextEncodingsWebPackageVersion>4.5.0</SystemTextEncodingsWebPackageVersion>
     <SystemThreadingChannelsPackageVersion>4.5.0</SystemThreadingChannelsPackageVersion>
     <SystemThreadingTasksDataflowPackageVersion>4.9.0</SystemThreadingTasksDataflowPackageVersion>
-    <SystemThreadingTasksExtensionsPackageVersion>4.5.2</SystemThreadingTasksExtensionsPackageVersion>
     <SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>
     <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.3</SystemNetWebSocketsWebSocketProtocolPackageVersion>
     <Utf8JsonPackageVersion>1.3.7</Utf8JsonPackageVersion>

From 4f7a95f99ae5bb6b006173a38a2506c10d3d105e Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Wed, 25 Mar 2020 09:35:35 -0700
Subject: [PATCH 4/4] Remove unnecessary files

---
 .../ArchiveBaseline.2.1.16.txt                | 19 -------------------
 .../ArchiveBaseline.2.1.16.txt                | 19 -------------------
 2 files changed, 38 deletions(-)
 delete mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.16.txt
 delete mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.16.txt

diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.16.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.16.txt
deleted file mode 100644
index 488c50fa82..0000000000
--- a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.16.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-runtime.native.system.net.security\4.3.0\.signature.p7s
-runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\4.3.0\.signature.p7s
-runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
-runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
-runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
-runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
-system.composition.attributedmodel\1.0.31\.signature.p7s
-system.composition.runtime\1.0.31\.signature.p7s
-system.reflection.emit.ilgeneration\4.3.0\.signature.p7s
-system.reflection.emit.lightweight\4.3.0\.signature.p7s
-system.reflection.typeextensions\4.3.0\.signature.p7s
-system.runtime.serialization.json\4.0.2\.signature.p7s
-system.runtime.serialization.primitives\4.3.0\.signature.p7s
-system.security.cryptography.cng\4.3.0\.signature.p7s
-system.security.cryptography.openssl\4.3.0\.signature.p7s
-system.security.principal\4.3.0\.signature.p7s
-system.text.encoding.codepages\4.3.0\.signature.p7s
-system.xml.xpath.xdocument\4.3.0\.signature.p7s
-system.xml.xpath\4.3.0\.signature.p7s
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.16.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.16.txt
deleted file mode 100644
index 488c50fa82..0000000000
--- a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.16.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-runtime.native.system.net.security\4.3.0\.signature.p7s
-runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\4.3.0\.signature.p7s
-runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
-runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
-runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
-runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
-system.composition.attributedmodel\1.0.31\.signature.p7s
-system.composition.runtime\1.0.31\.signature.p7s
-system.reflection.emit.ilgeneration\4.3.0\.signature.p7s
-system.reflection.emit.lightweight\4.3.0\.signature.p7s
-system.reflection.typeextensions\4.3.0\.signature.p7s
-system.runtime.serialization.json\4.0.2\.signature.p7s
-system.runtime.serialization.primitives\4.3.0\.signature.p7s
-system.security.cryptography.cng\4.3.0\.signature.p7s
-system.security.cryptography.openssl\4.3.0\.signature.p7s
-system.security.principal\4.3.0\.signature.p7s
-system.text.encoding.codepages\4.3.0\.signature.p7s
-system.xml.xpath.xdocument\4.3.0\.signature.p7s
-system.xml.xpath\4.3.0\.signature.p7s