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

Update branding to 2.1.18 (#20171)

This commit is contained in:
William Godbe 2020-03-26 11:57:57 -07:00 committed by GitHub
parent e9e66d8f21
commit 2604ce9eba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 3 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> <Project>
<PropertyGroup> <PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<AspNetCoreBaselineVersion>2.1.16</AspNetCoreBaselineVersion> <AspNetCoreBaselineVersion>2.1.17</AspNetCoreBaselineVersion>
</PropertyGroup> </PropertyGroup>
<!-- Package: dotnet-dev-certs--> <!-- Package: dotnet-dev-certs-->
<PropertyGroup Condition=" '$(PackageId)' == '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. build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
--> -->
<Baseline Version="2.1.16"> <Baseline Version="2.1.17">
<Package Id="dotnet-dev-certs" Version="2.1.1" /> <Package Id="dotnet-dev-certs" Version="2.1.1" />
<Package Id="dotnet-sql-cache" Version="2.1.1" /> <Package Id="dotnet-sql-cache" Version="2.1.1" />
<Package Id="dotnet-user-secrets" Version="2.1.1" /> <Package Id="dotnet-user-secrets" Version="2.1.1" />

4
eng/PatchConfig.props
View File

@ -60,4 +60,8 @@ Later on, this will be checked using this condition:
<PackagesInPatch> <PackagesInPatch>
</PackagesInPatch> </PackagesInPatch>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.18' ">
<PackagesInPatch>
</PackagesInPatch>
</PropertyGroup>
</Project> </Project>

1
src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.17.txt Normal file
View File

@ -0,0 +1 @@

1
src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.17.txt Normal file
View File

@ -0,0 +1 @@

2
version.props
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<AspNetCoreMajorVersion>2</AspNetCoreMajorVersion> <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion> <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>17</AspNetCorePatchVersion> <AspNetCorePatchVersion>18</AspNetCorePatchVersion>
<PreReleaseLabel>servicing</PreReleaseLabel> <PreReleaseLabel>servicing</PreReleaseLabel>
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel> <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber> <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>