Skip to content

Commit 82c42d5

Browse files
committed
Update branding to 2.1.14
- dotnet/aspnetcore-internal#3153
1 parent 1fe84a6 commit 82c42d5

File tree

6 files changed

+15
-16
lines changed

6 files changed

+15
-16
lines changed

eng/Baseline.Designer.props

+5-4
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.12</AspNetCoreBaselineVersion>
5+
<AspNetCoreBaselineVersion>2.1.13</AspNetCoreBaselineVersion>
66
</PropertyGroup>
77
<!-- Package: dotnet-dev-certs-->
88
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -284,10 +284,11 @@
284284
</ItemGroup>
285285
<!-- Package: Microsoft.AspNetCore.DataProtection.AzureStorage-->
286286
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.AzureStorage' ">
287-
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
287+
<BaselinePackageVersion>2.1.13</BaselinePackageVersion>
288288
</PropertyGroup>
289289
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.AzureStorage' AND '$(TargetFramework)' == 'netstandard2.0' ">
290290
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.1.1, )" />
291+
<BaselinePackageReference Include="Microsoft.Data.OData" Version="[5.8.4, )" />
291292
<BaselinePackageReference Include="WindowsAzure.Storage" Version="[8.1.4, )" />
292293
</ItemGroup>
293294
<!-- Package: Microsoft.AspNetCore.DataProtection.Extensions-->
@@ -1117,12 +1118,12 @@
11171118
</ItemGroup>
11181119
<!-- Package: Microsoft.AspNetCore.SpaServices-->
11191120
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices' ">
1120-
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
1121+
<BaselinePackageVersion>2.1.13</BaselinePackageVersion>
11211122
</PropertyGroup>
11221123
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices' AND '$(TargetFramework)' == 'netstandard2.0' ">
1123-
<BaselinePackageReference Include="Microsoft.AspNetCore.NodeServices" Version="[2.1.1, )" />
11241124
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="[2.1.1, )" />
11251125
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="[2.1.1, )" />
1126+
<BaselinePackageReference Include="Microsoft.AspNetCore.NodeServices" Version="[2.1.1, )" />
11261127
</ItemGroup>
11271128
<!-- Package: Microsoft.AspNetCore.StaticFiles-->
11281129
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.StaticFiles' ">

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.12">
7+
<Baseline Version="2.1.13">
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" />
@@ -36,7 +36,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
3636
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" />
3737
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="2.1.1" />
3838
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="2.1.1" />
39-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.1.1" />
39+
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.1.13" />
4040
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="2.1.1" />
4141
<Package Id="Microsoft.AspNetCore.DataProtection.Redis" Version="0.4.1" />
4242
<Package Id="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.1.1" />
@@ -115,7 +115,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
115115
<Package Id="Microsoft.AspNetCore.SignalR.Redis" Version="1.0.11" />
116116
<Package Id="Microsoft.AspNetCore.SignalR" Version="1.0.4" />
117117
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.1.1" />
118-
<Package Id="Microsoft.AspNetCore.SpaServices" Version="2.1.1" />
118+
<Package Id="Microsoft.AspNetCore.SpaServices" Version="2.1.13" />
119119
<Package Id="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
120120
<Package Id="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
121121
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.1.7" />

eng/PatchConfig.props

+4-8
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@ Later on, this will be checked using this condition:
1818
Microsoft.AspNetCore.Authentication.Google;
1919
</PackagesInPatch>
2020
</PropertyGroup>
21-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.9' ">
22-
<PackagesInPatch>
23-
</PackagesInPatch>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.10' ">
26-
<PackagesInPatch>
27-
</PackagesInPatch>
28-
</PropertyGroup>
2921
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.11' ">
3022
<PackagesInPatch>
3123
Microsoft.AspNetCore.Identity.UI;
@@ -46,4 +38,8 @@ Later on, this will be checked using this condition:
4638
Microsoft.AspNetCore.SpaServices;
4739
</PackagesInPatch>
4840
</PropertyGroup>
41+
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.14' ">
42+
<PackagesInPatch>
43+
</PackagesInPatch>
44+
</PropertyGroup>
4945
</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>13</AspNetCorePatchVersion>
5+
<AspNetCorePatchVersion>14</AspNetCorePatchVersion>
66
<PreReleaseLabel>servicing</PreReleaseLabel>
77
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
88
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>

0 commit comments

Comments
 (0)