From e497f4101f2a34a71e686a0c06243d3a4a8c9589 Mon Sep 17 00:00:00 2001
From: Doug Bunting <drb24@cornell.edu>
Date: Wed, 6 Mar 2019 19:45:46 -0800
Subject: [PATCH] Update branding to 2.1.10 (#8265)

---
 build/dependencies.props                                    | 4 ++--
 eng/Baseline.Designer.props                                 | 2 +-
 eng/Baseline.xml                                            | 2 +-
 eng/PatchConfig.props                                       | 5 +++++
 .../Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.9.txt | 6 ++++++
 .../Archive.CiServer.Patch/ArchiveBaseline.2.1.9.txt        | 6 ++++++
 version.props                                               | 2 +-
 7 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.9.txt
 create mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.9.txt

diff --git a/build/dependencies.props b/build/dependencies.props
index 03f4300c27..2b335ab806 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -2,8 +2,8 @@
   <!-- These package versions may be overridden or updated by automation. -->
   <PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
     <!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
-    <MicrosoftNETCoreAppPackageVersion>2.1.7</MicrosoftNETCoreAppPackageVersion>
-    <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.7</MicrosoftNETCoreDotNetAppHostPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>2.1.9</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.9</MicrosoftNETCoreDotNetAppHostPackageVersion>
  </PropertyGroup>
 
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 3c053b176e..190af91a42 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.1.8</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.1.9</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: dotnet-dev-certs-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index b7f70b9b93..a15dae40ff 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.8">
+<Baseline Version="2.1.9">
   <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 70a6297f74..187efa606a 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -23,4 +23,9 @@ Later on, this will be checked using this condition:
     <PackagesInPatch>
     </PackagesInPatch>
   </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.10' ">
+    <PackagesInPatch>
+    </PackagesInPatch>
+  </PropertyGroup>
 </Project>
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.9.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.9.txt
new file mode 100644
index 0000000000..6d918a778c
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.9.txt
@@ -0,0 +1,6 @@
+microsoft.netcore.targets\1.1.0\.signature.p7s
+runtime.native.system.security.cryptography\4.0.0\.signature.p7s
+system.composition.convention\1.0.31\.signature.p7s
+system.composition.typedparts\1.0.31\.signature.p7s
+system.globalization.extensions\4.0.1\.signature.p7s
+system.threading.tasks.parallel\4.3.0\.signature.p7s
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.9.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.9.txt
new file mode 100644
index 0000000000..6d918a778c
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.9.txt
@@ -0,0 +1,6 @@
+microsoft.netcore.targets\1.1.0\.signature.p7s
+runtime.native.system.security.cryptography\4.0.0\.signature.p7s
+system.composition.convention\1.0.31\.signature.p7s
+system.composition.typedparts\1.0.31\.signature.p7s
+system.globalization.extensions\4.0.1\.signature.p7s
+system.threading.tasks.parallel\4.3.0\.signature.p7s
diff --git a/version.props b/version.props
index c696d687f3..ec99366288 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>9</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>10</AspNetCorePatchVersion>
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
     <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>