From 26365e78398b60805c1f3f9c602a12b2897b3534 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Wed, 20 May 2020 13:40:46 -0700
Subject: [PATCH 1/4] Update branding (#22046)

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

diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 3ff7443158..45e64d60af 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.1.17</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.1.18</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: dotnet-dev-certs-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -658,11 +658,11 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Mvc.Formatters.Json-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Formatters.Json' ">
-    <BaselinePackageVersion>2.1.3</BaselinePackageVersion>
+    <BaselinePackageVersion>2.1.18</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Formatters.Json' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.1.3, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.1.3, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Mvc.Formatters.Xml-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Formatters.Xml' ">
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 743a85e00e..8344a8e586 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.17">
+<Baseline Version="2.1.18">
   <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" />
@@ -73,7 +73,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <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" />
+  <Package Id="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.1.18" />
   <Package Id="Microsoft.AspNetCore.Mvc.Formatters.Xml" Version="2.1.3" />
   <Package Id="Microsoft.AspNetCore.Mvc.Localization" Version="2.1.3" />
   <Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.1.2" />
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 4e0ba9c955..45de9044c3 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -65,4 +65,8 @@ Later on, this will be checked using this condition:
       Microsoft.AspNetCore.Mvc.Formatters.Json;
     </PackagesInPatch>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.19' ">
+    <PackagesInPatch>
+    </PackagesInPatch>
+  </PropertyGroup>
 </Project>
diff --git a/version.props b/version.props
index db42b69012..061d552d88 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>18</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>19</AspNetCorePatchVersion>
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
     <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>

From fca37bf5eac39d8adb64e4e1fd35df81c34c3d69 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 21 May 2020 12:30:39 -0700
Subject: [PATCH 2/4] [release/2.1] Make .msi GUIDs unique (#21803)

* Make .msi GUIDs unique

* Fix GuidInputs
---
 src/Installers/Windows/Wix.targets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets
index 85eecfa243..3986aeaf33 100644
--- a/src/Installers/Windows/Wix.targets
+++ b/src/Installers/Windows/Wix.targets
@@ -6,8 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <GuidInputs>$(Version);$(Platform)</GuidInputs>
-    <GuidInputs Condition="'$(IsFinalBuild)' != 'true'">$(GuidInputs);$(BuildNumber)</GuidInputs>
+    <GuidInputs>$(Version);$(Platform);$(BuildNumber)</GuidInputs>
   </PropertyGroup>
 
   <UsingTask AssemblyFile="$(OutputPath)..\InstallerTasks\InstallerTasks.dll" TaskName="RepoTasks.GenerateGuid" />

From 9e38dcf1fc0335862e1ba6f19fc6a1f30e82ebb0 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Fri, 22 May 2020 10:53:28 -0700
Subject: [PATCH 3/4] Add missing archive baselines for 2.1.18 release

---
 .../Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.18.txt     | 1 +
 .../Archive.CiServer.Patch/ArchiveBaseline.2.1.18.txt            | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.18.txt
 create mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.18.txt

diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.18.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.18.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.18.txt
@@ -0,0 +1 @@
+
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.18.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.18.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.18.txt
@@ -0,0 +1 @@
+

From 10d1f88b299ffbef054dce1ec297b4d8af6feaf4 Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Tue, 9 Jun 2020 16:39:06 -0700
Subject: [PATCH 4/4] Remove unneeded stuff

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

diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.18.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.18.txt
deleted file mode 100644
index 8b13789179..0000000000
--- a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.18.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.18.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.18.txt
deleted file mode 100644
index 8b13789179..0000000000
--- a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.18.txt
+++ /dev/null
@@ -1 +0,0 @@
-