Skip to content

Commit 6b1c28e

Browse files
dougbudougbu
authored
[release/5.0] Merge, update baselines, SDK and runtimes (#30781)
- dotnet/aspnetcore-internal#3783 - Merge commit 'e882394a7bb38930da748291fe2c2ceaa6a80588' into 'release/5.0' - Update `$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)` - Correct problem in `BaselineGenerator` - Re-enable baseline validation - Update package baselines - Update SDK and runtime versions
2 parents bf9a344 + f636f74 commit 6b1c28e

File tree

17 files changed

+448
-392
lines changed

17 files changed

+448
-392
lines changed

‎NuGet.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-efcore -->
7+
<add key="darc-int-dotnet-efcore-cfd206a" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-cfd206aa/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-efcore -->
89
<!-- Begin: Package sources from dotnet-runtime -->
10+
<add key="darc-int-dotnet-runtime-f27d337" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-f27d3372/nuget/v3/index.json" />
911
<!-- End: Package sources from dotnet-runtime -->
1012
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1113
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -19,8 +21,10 @@
1921
<disabledPackageSources>
2022
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2123
<!-- Begin: Package sources from dotnet-runtime -->
24+
<add key="darc-int-dotnet-runtime-f27d337" value="true" />
2225
<!-- End: Package sources from dotnet-runtime -->
2326
<!-- Begin: Package sources from dotnet-efcore -->
27+
<add key="darc-int-dotnet-efcore-cfd206a" value="true" />
2428
<!-- End: Package sources from dotnet-efcore -->
2529
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2630
</disabledPackageSources>

‎eng/Baseline.Designer.props‎

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

‎eng/Baseline.xml‎

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

0 commit comments

Comments
 (0)