From 51584c21dd7440e554a21335c65f4051a1fac1bb Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 9 Jun 2020 18:27:36 -0700
Subject: [PATCH] Revert "Update branding to 2.1.20"
This reverts commit d831217cf5b474b12352d668b11798575b254fbc.
---
eng/Baseline.Designer.props | 2 +-
eng/Baseline.xml | 2 +-
eng/PatchConfig.props | 6 +++++-
.../ArchiveBaseline.2.1.19.txt | 1 -
.../Archive.CiServer.Patch/ArchiveBaseline.2.1.19.txt | 1 -
version.props | 2 +-
6 files changed, 8 insertions(+), 6 deletions(-)
delete mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.19.txt
delete mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.19.txt
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 1622fa70413..45e64d60af8 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- <AspNetCoreBaselineVersion>2.1.19</AspNetCoreBaselineVersion>
+ <AspNetCoreBaselineVersion>2.1.18</AspNetCoreBaselineVersion>
</PropertyGroup>
<!-- Package: dotnet-dev-certs-->
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 7497e78a7ba..8344a8e586e 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.19">
+<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" />
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 0fa48bac75f..45de9044c3e 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -56,12 +56,16 @@ Later on, this will be checked using this condition:
Microsoft.AspNetCore.Mvc.Core;
</PackagesInPatch>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.17' ">
+ <PackagesInPatch>
+ </PackagesInPatch>
+ </PropertyGroup>
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.18' ">
<PackagesInPatch>
Microsoft.AspNetCore.Mvc.Formatters.Json;
</PackagesInPatch>
</PropertyGroup>
- <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.20' ">
+ <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.19' ">
<PackagesInPatch>
</PackagesInPatch>
</PropertyGroup>
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.19.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.19.txt
deleted file mode 100644
index 8b137891791..00000000000
--- a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.19.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.19.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.19.txt
deleted file mode 100644
index 8b137891791..00000000000
--- a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.19.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/version.props b/version.props
index 8a787e0583a..061d552d881 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
<PropertyGroup>
<AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
- <AspNetCorePatchVersion>20</AspNetCorePatchVersion>
+ <AspNetCorePatchVersion>19</AspNetCorePatchVersion>
<PreReleaseLabel>servicing</PreReleaseLabel>
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>
--
GitLab