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] 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>