From 4cbc33da7414b4b8333e2d18bd8419f582c30daf Mon Sep 17 00:00:00 2001
From: Doug Bunting <dougbu@microsoft.com>
Date: Wed, 6 Mar 2019 19:47:36 -0800
Subject: [PATCH] Update branding to 2.2.4

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

diff --git a/build/dependencies.props b/build/dependencies.props
index b2e17ce93e..8240460081 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)' == '' ">
     <!-- MicrosoftNETCoreApp22PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
-    <MicrosoftNETCoreAppPackageVersion>2.2.2</MicrosoftNETCoreAppPackageVersion>
-    <MicrosoftNETCoreDotNetAppHostPackageVersion>2.2.2</MicrosoftNETCoreDotNetAppHostPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>2.2.3</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreDotNetAppHostPackageVersion>2.2.3</MicrosoftNETCoreDotNetAppHostPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 0bca2a489a..87784eccc8 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.2.2</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.2.3</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: dotnet-dev-certs-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index f6e6959091..094b040f20 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.2.x. Update this list when preparing for a new patch.
 
 -->
-<Baseline Version="2.2.2">
+<Baseline Version="2.2.3">
   <Package Id="dotnet-dev-certs" Version="2.2.0" />
   <Package Id="dotnet-sql-cache" Version="2.2.0" />
   <Package Id="dotnet-user-secrets" Version="2.2.0" />
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 5951ed8785..fcc05ede1d 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -43,4 +43,8 @@ Later on, this will be checked using this condition:
     <PackagesInPatch>
     </PackagesInPatch>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.4' ">
+    <PackagesInPatch>
+    </PackagesInPatch>
+  </PropertyGroup>
 </Project>
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.3.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.3.txt
new file mode 100644
index 0000000000..85004251cf
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.3.txt
@@ -0,0 +1,19 @@
+microsoft.netcore.targets\1.0.1\.signature.p7s
+microsoft.netcore.targets\1.1.0\.signature.p7s
+runtime.native.system.io.compression\4.3.0\.signature.p7s
+runtime.native.system.net.http\4.3.0\.signature.p7s
+runtime.native.system.security.cryptography\4.0.0\.signature.p7s
+runtime.native.system\4.3.0\.signature.p7s
+system.private.datacontractserialization\4.1.1\.signature.p7s
+system.reflection.emit.lightweight\4.3.0\.signature.p7s
+system.reflection.emit\4.3.0\.signature.p7s
+system.reflection.typeextensions\4.1.0\.signature.p7s
+system.runtime.serialization.primitives\4.3.0\.signature.p7s
+system.security.cryptography.csp\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.threading.tasks.extensions\4.3.0\.signature.p7s
+system.threading.thread\4.3.0\.signature.p7s
+system.threading.threadpool\4.3.0\.signature.p7s
+system.xml.xmlserializer\4.0.11\.signature.p7s
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.3.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.3.txt
new file mode 100644
index 0000000000..85004251cf
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.3.txt
@@ -0,0 +1,19 @@
+microsoft.netcore.targets\1.0.1\.signature.p7s
+microsoft.netcore.targets\1.1.0\.signature.p7s
+runtime.native.system.io.compression\4.3.0\.signature.p7s
+runtime.native.system.net.http\4.3.0\.signature.p7s
+runtime.native.system.security.cryptography\4.0.0\.signature.p7s
+runtime.native.system\4.3.0\.signature.p7s
+system.private.datacontractserialization\4.1.1\.signature.p7s
+system.reflection.emit.lightweight\4.3.0\.signature.p7s
+system.reflection.emit\4.3.0\.signature.p7s
+system.reflection.typeextensions\4.1.0\.signature.p7s
+system.runtime.serialization.primitives\4.3.0\.signature.p7s
+system.security.cryptography.csp\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.threading.tasks.extensions\4.3.0\.signature.p7s
+system.threading.thread\4.3.0\.signature.p7s
+system.threading.threadpool\4.3.0\.signature.p7s
+system.xml.xmlserializer\4.0.11\.signature.p7s
diff --git a/version.props b/version.props
index 6a5491db68..cb564446e4 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>2</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>3</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>4</AspNetCorePatchVersion>
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel></PreReleaseBrandingLabel>
     <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">$([System.DateTime]::Now.ToString('yyMMdd'))-99</BuildNumber>