Skip to content

Commit f3b7077

Browse files
dougbudougbu
authored
Merge branch 'release/2.2' => 'release/3.0' (#14358)
2 parents 06ca2c4 + a925230 commit f3b7077

File tree

3 files changed

+21
-20
lines changed

3 files changed

+21
-20
lines changed

‎eng/Baseline.Designer.props

Lines changed: 11 additions & 10 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.2.6</AspNetCoreBaselineVersion>
5+
<AspNetCoreBaselineVersion>2.2.7</AspNetCoreBaselineVersion>
66
</PropertyGroup>
77
<!-- Package: dotnet-dev-certs-->
88
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -77,12 +77,12 @@
7777
</ItemGroup>
7878
<!-- Package: Microsoft.AspNetCore.AspNetCoreModule-->
7979
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModule' ">
80-
<BaselinePackageVersion>2.2.6</BaselinePackageVersion>
80+
<BaselinePackageVersion>2.2.7</BaselinePackageVersion>
8181
</PropertyGroup>
8282
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModule' AND '$(TargetFramework)' == 'netcoreapp2.2' " />
8383
<!-- Package: Microsoft.AspNetCore.AspNetCoreModuleV2-->
8484
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModuleV2' ">
85-
<BaselinePackageVersion>2.2.6</BaselinePackageVersion>
85+
<BaselinePackageVersion>2.2.7</BaselinePackageVersion>
8686
</PropertyGroup>
8787
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModuleV2' AND '$(TargetFramework)' == 'netcoreapp2.2' " />
8888
<!-- Package: Microsoft.AspNetCore.Authentication.Abstractions-->
@@ -303,10 +303,11 @@
303303
</ItemGroup>
304304
<!-- Package: Microsoft.AspNetCore.DataProtection.AzureStorage-->
305305
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.AzureStorage' ">
306-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
306+
<BaselinePackageVersion>2.2.7</BaselinePackageVersion>
307307
</PropertyGroup>
308308
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.AzureStorage' AND '$(TargetFramework)' == 'netstandard2.0' ">
309309
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.2.0, )" />
310+
<BaselinePackageReference Include="Microsoft.Data.OData" Version="[5.8.4, )" />
310311
<BaselinePackageReference Include="WindowsAzure.Storage" Version="[8.1.4, )" />
311312
</ItemGroup>
312313
<!-- Package: Microsoft.AspNetCore.DataProtection.EntityFrameworkCore-->
@@ -434,21 +435,21 @@
434435
</ItemGroup>
435436
<!-- Package: Microsoft.AspNetCore.Hosting-->
436437
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Hosting' ">
437-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
438+
<BaselinePackageVersion>2.2.7</BaselinePackageVersion>
438439
</PropertyGroup>
439440
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Hosting' AND '$(TargetFramework)' == 'netstandard2.0' ">
440441
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
441-
<BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[2.2.0, )" />
442442
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.2.0, )" />
443443
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
444444
<BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[2.2.0, )" />
445-
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.0, )" />
445+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.4, )" />
446446
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="[2.2.0, )" />
447447
<BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[2.2.0, )" />
448448
<BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[2.2.0, )" />
449+
<BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[2.2.0, )" />
449450
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.2.0, )" />
450451
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
451-
<BaselinePackageReference Include="System.Diagnostics.DiagnosticSource" Version="[4.5.0, )" />
452+
<BaselinePackageReference Include="System.Diagnostics.DiagnosticSource" Version="[4.5.1, )" />
452453
<BaselinePackageReference Include="System.Reflection.Metadata" Version="[1.6.0, )" />
453454
</ItemGroup>
454455
<!-- Package: Microsoft.AspNetCore.Html.Abstractions-->
@@ -1197,12 +1198,12 @@
11971198
</ItemGroup>
11981199
<!-- Package: Microsoft.AspNetCore.SpaServices-->
11991200
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices' ">
1200-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
1201+
<BaselinePackageVersion>2.2.7</BaselinePackageVersion>
12011202
</PropertyGroup>
12021203
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices' AND '$(TargetFramework)' == 'netstandard2.0' ">
1203-
<BaselinePackageReference Include="Microsoft.AspNetCore.NodeServices" Version="[2.2.0, )" />
12041204
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="[2.2.0, )" />
12051205
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="[2.2.0, )" />
1206+
<BaselinePackageReference Include="Microsoft.AspNetCore.NodeServices" Version="[2.2.0, )" />
12061207
</ItemGroup>
12071208
<!-- Package: Microsoft.AspNetCore.StaticFiles-->
12081209
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.StaticFiles' ">

‎eng/Baseline.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ This file contains a list of all the packages and their versions which were rele
44
build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
55
66
-->
7-
<Baseline Version="2.2.6">
7+
<Baseline Version="2.2.7">
88
<Package Id="dotnet-dev-certs" Version="2.2.0" />
99
<Package Id="dotnet-sql-cache" Version="2.2.0" />
1010
<Package Id="dotnet-user-secrets" Version="2.2.0" />
1111
<Package Id="dotnet-watch" Version="2.2.0" />
1212
<Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
1313
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="2.2.0-preview-35687" />
1414
<Package Id="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.2.0" />
15-
<Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.6" />
16-
<Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.6" />
15+
<Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.7" />
16+
<Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.7" />
1717
<Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
1818
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="2.2.0" />
1919
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="2.2.0" />
@@ -39,7 +39,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
3939
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.2.0" />
4040
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="2.2.0" />
4141
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="2.2.0" />
42-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.2.0" />
42+
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.2.7" />
4343
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="2.2.0" />
4444
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="2.2.0" />
4545
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="2.2.5" />
@@ -53,7 +53,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
5353
<Package Id="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
5454
<Package Id="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.2.0" />
5555
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.2.0" />
56-
<Package Id="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
56+
<Package Id="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
5757
<Package Id="Microsoft.AspNetCore.Html.Abstractions" Version="2.2.0" />
5858
<Package Id="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
5959
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="1.1.0" />
@@ -122,7 +122,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
122122
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="1.1.5" />
123123
<Package Id="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
124124
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.2.0" />
125-
<Package Id="Microsoft.AspNetCore.SpaServices" Version="2.2.0" />
125+
<Package Id="Microsoft.AspNetCore.SpaServices" Version="2.2.7" />
126126
<Package Id="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
127127
<Package Id="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
128128
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />

‎eng/PatchConfig.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ Later on, this will be checked using this condition:
2929
java:signalr;
3030
</PackagesInPatch>
3131
</PropertyGroup>
32-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.3' ">
33-
<PackagesInPatch>
34-
</PackagesInPatch>
35-
</PropertyGroup>
3632
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.4' ">
3733
<PackagesInPatch>
3834
@aspnet/signalr;
@@ -70,4 +66,8 @@ Later on, this will be checked using this condition:
7066
Microsoft.AspNetCore.SpaServices;
7167
</PackagesInPatch>
7268
</PropertyGroup>
69+
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.8' ">
70+
<PackagesInPatch>
71+
</PackagesInPatch>
72+
</PropertyGroup>
7373
</Project>

0 commit comments

Comments
 (0)