Skip to content

Commit b33960c

Browse files
sebastienrossebastienros
authored
Merge branch 'master' into merge/release/3.1-to-master
2 parents 1cdb159 + b7d41f1 commit b33960c

File tree

9 files changed

+980
-485
lines changed

9 files changed

+980
-485
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ stages:
340340
displayName: Build Arm64 Installers
341341

342342
# A few files must also go to the VS package feed.
343-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
343+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['PostBuildSign'], 'true')) }}:
344344
- task: NuGetCommand@2
345345
displayName: Push Visual Studio packages
346346
inputs:

‎.azure/pipelines/helix-matrix.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@
22
pr: none
33
trigger: none
44
schedules:
5+
# Cron timezone is UTC.
56
- cron: "0 */12 * * *"
67
branches:
78
include:
89
- master
910
always: true
11+
- cron: "0 9 * * *"
12+
branches:
13+
include:
14+
- release/5.0
15+
always: false
1016

1117
variables:
1218
- ${{ if ne(variables['System.TeamProject'], 'internal') }}:

‎.azure/pipelines/quarantined-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ pr:
2828
autoCancel: true
2929
branches:
3030
include:
31-
- release/5.0
3231
- master
32+
- release/5.0
3333
paths:
3434
exclude:
3535
- .github/*

‎eng/Baseline.Designer.props

Lines changed: 602 additions & 396 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml

Lines changed: 103 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,108 @@
1-
<!--
1+
<!--
22
3-
This file contains a list of all the packages and their versions which were released in ASP.NET Core 3.1.0.
3+
This file contains a list of all the packages and their versions which were released in ASP.NET Core 5.0.0.
44
Update this list when preparing for a new patch.
55
66
-->
7-
<Baseline Version="3.1.10">
8-
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
9-
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
10-
<Package Id="dotnet-sql-cache" Version="3.1.10" />
11-
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.1" />
12-
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.10" />
13-
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.10" />
14-
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.10" />
15-
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.10" />
16-
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.10" />
17-
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.10" />
18-
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.10" />
19-
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.10" />
20-
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.10" />
21-
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.10" />
22-
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.10" />
23-
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.10" />
24-
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.10" />
25-
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.10" />
26-
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.10" />
27-
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.10" />
28-
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.10" />
29-
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.10" />
30-
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.10" />
31-
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.10" />
32-
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.10" />
33-
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.10" />
34-
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
35-
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" />
36-
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.1" />
37-
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1" />
38-
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.1" />
39-
<Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.1" />
40-
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.10" />
41-
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.10" />
42-
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.10" />
43-
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.10" />
44-
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.10" />
45-
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.10" />
46-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.10" />
47-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.10" />
48-
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.10" />
49-
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.10" />
50-
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.10" />
51-
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.10" />
52-
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.10" />
53-
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.10" />
54-
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.10" />
55-
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.10" />
56-
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.10" />
57-
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.10" />
58-
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.10" />
59-
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.10" />
60-
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.10" />
61-
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.10" />
62-
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.10" />
63-
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.10" />
64-
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.10" />
65-
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.10" />
66-
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.10" />
67-
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.10" />
68-
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.10" />
69-
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />
70-
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.10" />
71-
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.10" />
72-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.10" />
73-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.10" />
74-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.10" />
75-
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.10" />
76-
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.10" />
77-
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.10" />
78-
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.10" />
79-
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.10" />
80-
<Package Id="Microsoft.dotnet-openapi" Version="3.1.10" />
81-
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.10" />
82-
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.10" />
83-
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.10" />
84-
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.10" />
85-
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.10" />
86-
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.10" />
87-
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.10" />
88-
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.10" />
89-
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.10" />
7+
<Baseline Version="5.0.0">
8+
<Package Id="AspNetCoreRuntime.5.0.x64" Version="5.0.0" />
9+
<Package Id="AspNetCoreRuntime.5.0.x86" Version="5.0.0" />
10+
<Package Id="dotnet-sql-cache" Version="5.0.0" />
11+
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="5.0.0" />
12+
<Package Id="Microsoft.AspNetCore.App.Ref" Version="5.0.0" />
13+
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="5.0.0" />
14+
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="5.0.0" />
15+
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="5.0.0" />
16+
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="5.0.0" />
17+
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="5.0.0" />
18+
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="5.0.0" />
19+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm" Version="5.0.0" />
20+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="5.0.0" />
21+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.0" />
22+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="5.0.0" />
23+
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="5.0.0" />
24+
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="5.0.0" />
25+
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="5.0.0" />
26+
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="5.0.0" />
27+
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="5.0.0" />
28+
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.0" />
29+
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.0" />
30+
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="5.0.0" />
31+
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.0" />
32+
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="5.0.0" />
33+
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="5.0.0" />
34+
<Package Id="Microsoft.AspNetCore.Authorization" Version="5.0.0" />
35+
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="5.0.0" />
36+
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="5.0.0" />
37+
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="5.0.0" />
38+
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="5.0.0" />
39+
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="5.0.0" />
40+
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="5.0.0" />
41+
<Package Id="Microsoft.AspNetCore.Components.Web" Version="5.0.0" />
42+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.0" />
43+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" />
44+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.0" />
45+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
46+
<Package Id="Microsoft.AspNetCore.Components" Version="5.0.0" />
47+
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="5.0.0" />
48+
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="5.0.0" />
49+
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="5.0.0" />
50+
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="5.0.0" />
51+
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="5.0.0" />
52+
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="5.0.0" />
53+
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="5.0.0" />
54+
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.0" />
55+
<Package Id="Microsoft.AspNetCore.DataProtection" Version="5.0.0" />
56+
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.0" />
57+
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="5.0.0" />
58+
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="5.0.0" />
59+
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="5.0.0" />
60+
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="5.0.0" />
61+
<Package Id="Microsoft.AspNetCore.Http.Features" Version="5.0.0" />
62+
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.0" />
63+
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="5.0.0" />
64+
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="5.0.0" />
65+
<Package Id="Microsoft.AspNetCore.Metadata" Version="5.0.0" />
66+
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="5.0.0" />
67+
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0" />
68+
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.0" />
69+
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.0" />
70+
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.0" />
71+
<Package Id="Microsoft.AspNetCore.Owin" Version="5.0.0" />
72+
<Package Id="Microsoft.AspNetCore.Razor.Language" Version="5.0.0" />
73+
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic" Version="5.0.0" />
74+
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="5.0.0" />
75+
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="5.0.0" />
76+
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="5.0.0" />
77+
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="5.0.0" />
78+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="5.0.0" />
79+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.0" />
80+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.0" />
81+
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="5.0.0" />
82+
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="5.0.0" />
83+
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.0" />
84+
<Package Id="Microsoft.AspNetCore.TestHost" Version="5.0.0" />
85+
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="5.0.0" />
86+
<Package Id="Microsoft.CodeAnalysis.Razor" Version="5.0.0" />
87+
<Package Id="Microsoft.dotnet-openapi" Version="5.0.0" />
88+
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="5.0.0" />
89+
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="5.0.0" />
90+
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.5.0" Version="5.0.0" />
91+
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0" Version="5.0.0" />
92+
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="5.0.0" />
93+
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="5.0.0" />
94+
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="5.0.0" />
95+
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="5.0.0" />
96+
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="5.0.0" />
97+
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.0" />
98+
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.0" />
99+
<Package Id="Microsoft.Extensions.Identity.Core" Version="5.0.0" />
100+
<Package Id="Microsoft.Extensions.Identity.Stores" Version="5.0.0" />
101+
<Package Id="Microsoft.Extensions.Localization.Abstractions" Version="5.0.0" />
102+
<Package Id="Microsoft.Extensions.Localization" Version="5.0.0" />
103+
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="5.0.0" />
104+
<Package Id="Microsoft.Extensions.ObjectPool" Version="5.0.0" />
105+
<Package Id="Microsoft.Extensions.WebEncoders" Version="5.0.0" />
106+
<Package Id="Microsoft.JSInterop.WebAssembly" Version="5.0.0" />
107+
<Package Id="Microsoft.JSInterop" Version="5.0.0" />
90108
</Baseline>

0 commit comments

Comments
 (0)