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

Update branding to 2.1.10 (#8265)

This commit is contained in:
Doug Bunting 2019-03-06 19:45:46 -08:00 committed by GitHub
parent db3795b368
commit e497f4101f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/dependencies.props
View File

@ -2,8 +2,8 @@
<!-- These package versions may be overridden or updated by automation. --> <!-- These package versions may be overridden or updated by automation. -->
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' "> <PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
<!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. --> <!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
<MicrosoftNETCoreAppPackageVersion>2.1.7</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETCoreAppPackageVersion>2.1.9</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.7</MicrosoftNETCoreDotNetAppHostPackageVersion> <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.9</MicrosoftNETCoreDotNetAppHostPackageVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" /> <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />

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.8</AspNetCoreBaselineVersion> <AspNetCoreBaselineVersion>2.1.9</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.8"> <Baseline Version="2.1.9">
<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" />

5
eng/PatchConfig.props
View File

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

6
src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.9.txt Normal file
View File

@ -0,0 +1,6 @@
microsoft.netcore.targets\1.1.0\.signature.p7s
runtime.native.system.security.cryptography\4.0.0\.signature.p7s
system.composition.convention\1.0.31\.signature.p7s
system.composition.typedparts\1.0.31\.signature.p7s
system.globalization.extensions\4.0.1\.signature.p7s
system.threading.tasks.parallel\4.3.0\.signature.p7s

6
src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.9.txt Normal file
View File

@ -0,0 +1,6 @@
microsoft.netcore.targets\1.1.0\.signature.p7s
runtime.native.system.security.cryptography\4.0.0\.signature.p7s
system.composition.convention\1.0.31\.signature.p7s
system.composition.typedparts\1.0.31\.signature.p7s
system.globalization.extensions\4.0.1\.signature.p7s
system.threading.tasks.parallel\4.3.0\.signature.p7s

2
version.props
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<AspNetCoreMajorVersion>2</AspNetCoreMajorVersion> <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion> <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>9</AspNetCorePatchVersion> <AspNetCorePatchVersion>10</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>