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

Update branding to 2.1.15 (#17273)

This commit is contained in:
John Luo 2019-11-20 17:10:59 -08:00 committed by GitHub
parent 57e68b069e
commit 147f950686
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/submodules.props
View File

@ -37,6 +37,6 @@
<ItemGroup> <ItemGroup>
<Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\Templating\" /> <Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\Templating\" />
<Repository Include="EntityFrameworkCore" /> <ShippedRepository Include="EntityFrameworkCore" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
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.13</AspNetCoreBaselineVersion> <AspNetCoreBaselineVersion>2.1.14</AspNetCoreBaselineVersion>
</PropertyGroup> </PropertyGroup>
<!-- Package: dotnet-dev-certs--> <!-- Package: dotnet-dev-certs-->
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' "> <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@ -235,7 +235,7 @@
</ItemGroup> </ItemGroup>
<!-- Package: Microsoft.AspNetCore.CookiePolicy--> <!-- Package: Microsoft.AspNetCore.CookiePolicy-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.CookiePolicy' "> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.CookiePolicy' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion> <BaselinePackageVersion>2.1.14</BaselinePackageVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.CookiePolicy' AND '$(TargetFramework)' == 'netstandard2.0' "> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.CookiePolicy' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
@ -1219,7 +1219,7 @@
</ItemGroup> </ItemGroup>
<!-- Package: Microsoft.Net.Http.Headers--> <!-- Package: Microsoft.Net.Http.Headers-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Http.Headers' "> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Http.Headers' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion> <BaselinePackageVersion>2.1.14</BaselinePackageVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Http.Headers' AND '$(TargetFramework)' == 'netstandard2.0' "> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Http.Headers' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[2.1.1, )" /> <BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[2.1.1, )" />

6
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.13"> <Baseline Version="2.1.14">
<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" />
@ -30,7 +30,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.1.1" /> <Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.1.1" /> <Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.1.3" /> <Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.1.2" /> <Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.1.14" />
<Package Id="Microsoft.AspNetCore.Cors" Version="2.1.1" /> <Package Id="Microsoft.AspNetCore.Cors" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="2.1.1" /> <Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" /> <Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" />
@ -124,7 +124,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.CodeAnalysis.Razor" Version="2.1.2" /> <Package Id="Microsoft.CodeAnalysis.Razor" Version="2.1.2" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="2.1.6" /> <Package Id="Microsoft.Extensions.Identity.Core" Version="2.1.6" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="2.1.6" /> <Package Id="Microsoft.Extensions.Identity.Stores" Version="2.1.6" />
<Package Id="Microsoft.Net.Http.Headers" Version="2.1.1" /> <Package Id="Microsoft.Net.Http.Headers" Version="2.1.14" />
<Package Id="Microsoft.Net.Sdk.Razor" Version="2.1.2" /> <Package Id="Microsoft.Net.Sdk.Razor" Version="2.1.2" />
<Package Id="Microsoft.Owin.Security.Interop" Version="2.1.2" /> <Package Id="Microsoft.Owin.Security.Interop" Version="2.1.2" />
</Baseline> </Baseline>

4
eng/PatchConfig.props
View File

@ -44,4 +44,8 @@ Later on, this will be checked using this condition:
Microsoft.AspNetCore.CookiePolicy; Microsoft.AspNetCore.CookiePolicy;
</PackagesInPatch> </PackagesInPatch>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.15' ">
<PackagesInPatch>
</PackagesInPatch>
</PropertyGroup>
</Project> </Project>

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

@ -0,0 +1 @@

1
src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.14.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>14</AspNetCorePatchVersion> <AspNetCorePatchVersion>15</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>