huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Update branding to 2.1.20" 

This reverts commit d831217cf5.
This commit is contained in:
Doug Bunting 2020-06-09 18:27:36 -07:00
parent d831217cf5
commit 51584c21dd
No known key found for this signature in database
GPG Key ID: EE41520987982C03
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eng/Baseline.Designer.props
View File

@ -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' ">

2
eng/Baseline.xml
View File

@ -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" />

6
eng/PatchConfig.props
View File

@ -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>

1
src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.19.txt
View File

@ -1 +0,0 @@

1
src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.19.txt
View File

@ -1 +0,0 @@

2
version.props
View File

@ -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>