diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 1622fa704135918c5b528a1e40fca842704f6780..45e64d60af82da7947ac26b06aadcc3f9a61deb8 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 7497e78a7ba4ea1979034695e42e88c9c08ebb63..8344a8e586e50cd57c9438919c92012d3dab423d 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 0fa48bac75fb53f7185bb120cc0d84732326dffc..45de9044c3e82ca50c2d394c676cabf8c1492c4a 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 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000 --- 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 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000 --- 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 8a787e0583ab6ccbf556d32106db0f143f70eefc..061d552d8816070ea3f0333ec1f509c973b48b6a 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>