Skip to content

Commit b8886a4

Browse files
authored
Update branding to 2.1.23 (dotnet#25710)
- dotnet/aspnetcore-internal#3676 - do actual branding and prepare for 2.1.23 patches, if any - add package archives for 2.1.22 - update package baselines for 2.1.22 nit: update a couple of versions for local builds
1 parent 3e29d0b commit b8886a4

File tree

8 files changed

+16
-10
lines changed

8 files changed

+16
-10
lines changed

build/dependencies.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<!-- These package versions may be overridden or updated by automation. -->
33
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
44
<!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
5-
<MicrosoftNETCoreAppPackageVersion>2.1.12</MicrosoftNETCoreAppPackageVersion>
6-
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.12</MicrosoftNETCoreDotNetAppHostPackageVersion>
5+
<MicrosoftNETCoreAppPackageVersion>2.1.22</MicrosoftNETCoreAppPackageVersion>
6+
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.22</MicrosoftNETCoreDotNetAppHostPackageVersion>
77
</PropertyGroup>
88

99
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
@@ -15,7 +15,7 @@
1515
<!-- Determined by build tools -->
1616
<InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
1717
<InternalAspNetCoreSiteExtensionSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSiteExtensionSdkPackageVersion>
18-
<InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.1.7-build-20190110.2</InternalAspNetCoreSdkPackageVersion>
18+
<InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.1.7-build-20200221.1</InternalAspNetCoreSdkPackageVersion>
1919
</PropertyGroup>
2020

2121
<!-- These are package versions that should not be overridden or updated by automation. -->

eng/Baseline.Designer.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<PropertyGroup>
44
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5-
<AspNetCoreBaselineVersion>2.1.21</AspNetCoreBaselineVersion>
5+
<AspNetCoreBaselineVersion>2.1.22</AspNetCoreBaselineVersion>
66
</PropertyGroup>
77
<!-- Package: dotnet-dev-certs-->
88
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -494,14 +494,14 @@
494494
</ItemGroup>
495495
<!-- Package: Microsoft.AspNetCore.Http-->
496496
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http' ">
497-
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
497+
<BaselinePackageVersion>2.1.22</BaselinePackageVersion>
498498
</PropertyGroup>
499499
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http' AND '$(TargetFramework)' == 'netstandard2.0' ">
500500
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="[2.1.1, )" />
501501
<BaselinePackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="[2.1.1, )" />
502-
<BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.1.1, )" />
503502
<BaselinePackageReference Include="Microsoft.Extensions.ObjectPool" Version="[2.1.1, )" />
504503
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
504+
<BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.1.1, )" />
505505
</ItemGroup>
506506
<!-- Package: Microsoft.AspNetCore.HttpOverrides-->
507507
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpOverrides' ">

eng/Baseline.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele
44
build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
55
66
-->
7-
<Baseline Version="2.1.21">
7+
<Baseline Version="2.1.22">
88
<Package Id="dotnet-dev-certs" Version="2.1.1" />
99
<Package Id="dotnet-sql-cache" Version="2.1.1" />
1010
<Package Id="dotnet-user-secrets" Version="2.1.1" />
@@ -56,7 +56,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
5656
<Package Id="Microsoft.AspNetCore.Http.Connections" Version="1.0.15" />
5757
<Package Id="Microsoft.AspNetCore.Http.Extensions" Version="2.1.21" />
5858
<Package Id="Microsoft.AspNetCore.Http.Features" Version="2.1.1" />
59-
<Package Id="Microsoft.AspNetCore.Http" Version="2.1.1" />
59+
<Package Id="Microsoft.AspNetCore.Http" Version="2.1.22" />
6060
<Package Id="Microsoft.AspNetCore.HttpOverrides" Version="2.1.1" />
6161
<Package Id="Microsoft.AspNetCore.HttpsPolicy" Version="2.1.1" />
6262
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.6" />

eng/PatchConfig.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,8 @@ Later on, this will be checked using this condition:
7777
Microsoft.AspNetCore.Http;
7878
</PackagesInPatch>
7979
</PropertyGroup>
80+
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.23' ">
81+
<PackagesInPatch>
82+
</PackagesInPatch>
83+
</PropertyGroup>
8084
</Project>

eng/dependencies.temp.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ This is required to provide dependencies for samples and tests.
44
-->
55
<Project>
66
<ItemGroup>
7-
<LatestPackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.1" />
7+
<LatestPackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.7" />
88
</ItemGroup>
99
</Project>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

version.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
44
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
5-
<AspNetCorePatchVersion>22</AspNetCorePatchVersion>
5+
<AspNetCorePatchVersion>23</AspNetCorePatchVersion>
66
<PreReleaseLabel>servicing</PreReleaseLabel>
77
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
88
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>

0 commit comments

Comments
 (0)