From 2604ce9eba4a6476309f10f0c1ce27afcdf08bb6 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 26 Mar 2020 11:57:57 -0700
Subject: [PATCH] Update branding to 2.1.18 (#20171)

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

diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 6f84c57d54..3ff7443158 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.1.16</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.1.17</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: dotnet-dev-certs-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index b73b3f92d7..743a85e00e 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.16">
+<Baseline Version="2.1.17">
   <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 87040c9a5e..46ef4cd3c4 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -60,4 +60,8 @@ Later on, this will be checked using this condition:
     <PackagesInPatch>
     </PackagesInPatch>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.18' ">
+    <PackagesInPatch>
+    </PackagesInPatch>
+  </PropertyGroup>
 </Project>
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.17.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.17.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.17.txt
@@ -0,0 +1 @@
+
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.17.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.17.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.17.txt
@@ -0,0 +1 @@
+
diff --git a/version.props b/version.props
index 9db8231048..db42b69012 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>17</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>18</AspNetCorePatchVersion>
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
     <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>