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

Update branding to 2.1.16

This commit is contained in:
John Luo 2020-01-14 14:42:47 -08:00
parent 163c80cb0f
commit 183a09f763
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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.14</AspNetCoreBaselineVersion> <AspNetCoreBaselineVersion>2.1.15</AspNetCoreBaselineVersion>
</PropertyGroup> </PropertyGroup>
<!-- Package: dotnet-dev-certs--> <!-- Package: dotnet-dev-certs-->
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' "> <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@ -453,23 +453,23 @@
</ItemGroup> </ItemGroup>
<!-- Package: Microsoft.AspNetCore.Http.Connections--> <!-- Package: Microsoft.AspNetCore.Http.Connections-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections' "> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections' ">
<BaselinePackageVersion>1.0.4</BaselinePackageVersion> <BaselinePackageVersion>1.0.15</BaselinePackageVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections' AND '$(TargetFramework)' == 'netcoreapp2.1' "> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections' AND '$(TargetFramework)' == 'netcoreapp2.1' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[1.0.4, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Authorization.Policy" Version="[2.1.1, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization.Policy" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[1.0.4, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Routing" Version="[2.1.1, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.Routing" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.WebSockets" Version="[2.1.1, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.WebSockets" Version="[2.1.1, )" />
<BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" /> <BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" />
<BaselinePackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="[4.5.3, )" /> <BaselinePackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="[4.5.3, )" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections' AND '$(TargetFramework)' == 'netstandard2.0' "> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[1.0.4, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Authorization.Policy" Version="[2.1.1, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization.Policy" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[1.0.4, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Routing" Version="[2.1.1, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.Routing" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.WebSockets" Version="[2.1.1, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.WebSockets" Version="[2.1.1, )" />
<BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" /> <BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" />
@ -1063,12 +1063,12 @@
</ItemGroup> </ItemGroup>
<!-- Package: Microsoft.AspNetCore.SignalR.Core--> <!-- Package: Microsoft.AspNetCore.SignalR.Core-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Core' "> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Core' ">
<BaselinePackageVersion>1.0.4</BaselinePackageVersion> <BaselinePackageVersion>1.0.15</BaselinePackageVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Core' AND '$(TargetFramework)' == 'netstandard2.0' "> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Core' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[1.0.4, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[1.0.4, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[1.0.4, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[1.0.4, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[2.1.1, )" /> <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" /> <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="System.Reflection.Emit" Version="[4.3.0, )" /> <BaselinePackageReference Include="System.Reflection.Emit" Version="[4.3.0, )" />

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.14"> <Baseline Version="2.1.15">
<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" />
@ -53,7 +53,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" /> <Package Id="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="1.0.4" /> <Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="1.0.4" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="1.0.4" /> <Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="1.0.4" />
<Package Id="Microsoft.AspNetCore.Http.Connections" Version="1.0.4" /> <Package Id="Microsoft.AspNetCore.Http.Connections" Version="1.0.15" />
<Package Id="Microsoft.AspNetCore.Http.Extensions" Version="2.1.1" /> <Package Id="Microsoft.AspNetCore.Http.Extensions" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Http.Features" Version="2.1.1" /> <Package Id="Microsoft.AspNetCore.Http.Features" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Http" Version="2.1.1" /> <Package Id="Microsoft.AspNetCore.Http" Version="2.1.1" />
@ -109,7 +109,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="1.0.4" /> <Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="1.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="1.0.4" /> <Package Id="Microsoft.AspNetCore.SignalR.Client" Version="1.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="1.0.4" /> <Package Id="Microsoft.AspNetCore.SignalR.Common" Version="1.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Core" Version="1.0.4" /> <Package Id="Microsoft.AspNetCore.SignalR.Core" Version="1.0.15" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="1.0.4" /> <Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="1.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="1.0.11" /> <Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="1.0.11" />
<Package Id="Microsoft.AspNetCore.SignalR.Redis" Version="1.0.11" /> <Package Id="Microsoft.AspNetCore.SignalR.Redis" Version="1.0.11" />

2
eng/PatchConfig.props
View File

@ -44,7 +44,7 @@ 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' "> <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.16' ">
<PackagesInPatch> <PackagesInPatch>
Microsoft.AspNetCore.Http.Connections; Microsoft.AspNetCore.Http.Connections;
Microsoft.AspNetCore.SignalR.Core; Microsoft.AspNetCore.SignalR.Core;

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

@ -0,0 +1 @@

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