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

Update branding (#22046)

This commit is contained in:
William Godbe 2020-05-20 13:40:46 -07:00 committed by GitHub
parent 8d09403118
commit 26365e7839
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eng/Baseline.Designer.props
View File

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

4
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.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" />

4
eng/PatchConfig.props
View File

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

2
version.props
View File

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