Skip to content

Commit 147f950

Browse files
author
John Luo
authored
Update branding to 2.1.15 (#17273)
1 parent 57e68b0 commit 147f950

File tree

7 files changed

+14
-8
lines changed

7 files changed

+14
-8
lines changed

build/submodules.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@
3737

3838
<ItemGroup>
3939
<Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\Templating\" />
40-
<Repository Include="EntityFrameworkCore" />
40+
<ShippedRepository Include="EntityFrameworkCore" />
4141
</ItemGroup>
4242
</Project>

eng/Baseline.Designer.props

+3-3
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.13</AspNetCoreBaselineVersion>
5+
<AspNetCoreBaselineVersion>2.1.14</AspNetCoreBaselineVersion>
66
</PropertyGroup>
77
<!-- Package: dotnet-dev-certs-->
88
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -235,7 +235,7 @@
235235
</ItemGroup>
236236
<!-- Package: Microsoft.AspNetCore.CookiePolicy-->
237237
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.CookiePolicy' ">
238-
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
238+
<BaselinePackageVersion>2.1.14</BaselinePackageVersion>
239239
</PropertyGroup>
240240
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.CookiePolicy' AND '$(TargetFramework)' == 'netstandard2.0' ">
241241
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
@@ -1219,7 +1219,7 @@
12191219
</ItemGroup>
12201220
<!-- Package: Microsoft.Net.Http.Headers-->
12211221
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Http.Headers' ">
1222-
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
1222+
<BaselinePackageVersion>2.1.14</BaselinePackageVersion>
12231223
</PropertyGroup>
12241224
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Http.Headers' AND '$(TargetFramework)' == 'netstandard2.0' ">
12251225
<BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[2.1.1, )" />

eng/Baseline.xml

+3-3
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.13">
7+
<Baseline Version="2.1.14">
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" />
@@ -30,7 +30,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
3030
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.1.1" />
3131
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.1.1" />
3232
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.1.3" />
33-
<Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.1.2" />
33+
<Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.1.14" />
3434
<Package Id="Microsoft.AspNetCore.Cors" Version="2.1.1" />
3535
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="2.1.1" />
3636
<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.
124124
<Package Id="Microsoft.CodeAnalysis.Razor" Version="2.1.2" />
125125
<Package Id="Microsoft.Extensions.Identity.Core" Version="2.1.6" />
126126
<Package Id="Microsoft.Extensions.Identity.Stores" Version="2.1.6" />
127-
<Package Id="Microsoft.Net.Http.Headers" Version="2.1.1" />
127+
<Package Id="Microsoft.Net.Http.Headers" Version="2.1.14" />
128128
<Package Id="Microsoft.Net.Sdk.Razor" Version="2.1.2" />
129129
<Package Id="Microsoft.Owin.Security.Interop" Version="2.1.2" />
130130
</Baseline>

eng/PatchConfig.props

+4
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,8 @@ Later on, this will be checked using this condition:
4444
Microsoft.AspNetCore.CookiePolicy;
4545
</PackagesInPatch>
4646
</PropertyGroup>
47+
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.15' ">
48+
<PackagesInPatch>
49+
</PackagesInPatch>
50+
</PropertyGroup>
4751
</Project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

version.props

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

0 commit comments

Comments
 (0)