Skip to content

Commit bd39136

Browse files
dougbudougbu
authored
Merge pull request #41613 from vseanreesermsft/internal-merge-3.1-2022-05-10-1215
Merging internal commits for release/3.1
2 parents 5ca6c9a + 47b21fd commit bd39136

File tree

9 files changed

+644
-523
lines changed

9 files changed

+644
-523
lines changed

‎NuGet.config

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
<!-- Begin: Package sources from dotnet-corefx -->
99
<!-- End: Package sources from dotnet-corefx -->
1010
<!-- Begin: Package sources from dotnet-core-setup -->
11-
<!-- End: Package sources from dotnet-core-setup -->
12-
<!-- Begin: Package sources from dotnet-efcore -->
13-
<!-- End: Package sources from dotnet-efcore -->
14-
<!-- Begin: Package sources from dotnet-extensions -->
1511
<!-- End: Package sources from dotnet-extensions -->
1612
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1713
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,12 +19,6 @@
2319
<clear />
2420
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2521
<!-- Begin: Package sources from dotnet-razor-tooling -->
26-
<!-- End: Package sources from dotnet-razor-tooling -->
27-
<!-- Begin: Package sources from dotnet-extensions -->
28-
<!-- End: Package sources from dotnet-extensions -->
29-
<!-- Begin: Package sources from dotnet-efcore -->
30-
<!-- End: Package sources from dotnet-efcore -->
31-
<!-- Begin: Package sources from dotnet-core-setup -->
3222
<!-- End: Package sources from dotnet-core-setup -->
3323
<!-- Begin: Package sources from dotnet-corefx -->
3424
<!-- End: Package sources from dotnet-corefx -->

‎eng/Baseline.Designer.props

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

‎eng/Baseline.xml

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,90 @@
1-
<!--
1+
<!--
22
33
This file contains a list of all the packages and their versions which were released in ASP.NET Core 3.1.0.
44
Update this list when preparing for a new patch.
55
66
-->
7-
<Baseline Version="3.1.24">
7+
<Baseline Version="3.1.25">
88
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
99
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
10-
<Package Id="dotnet-sql-cache" Version="3.1.24" />
10+
<Package Id="dotnet-sql-cache" Version="3.1.25" />
1111
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.1" />
12-
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.24" />
13-
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.24" />
14-
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.24" />
15-
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.24" />
16-
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.24" />
17-
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.24" />
18-
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.24" />
19-
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.24" />
20-
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.24" />
21-
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.24" />
22-
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.24" />
23-
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.24" />
24-
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.24" />
25-
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.24" />
26-
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.24" />
27-
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.24" />
28-
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.24" />
29-
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.24" />
30-
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.24" />
31-
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.24" />
32-
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.24" />
33-
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.24" />
12+
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.25" />
13+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.25" />
14+
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.25" />
15+
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.25" />
16+
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.25" />
17+
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.25" />
18+
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.25" />
19+
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.25" />
20+
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.25" />
21+
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.25" />
22+
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.25" />
23+
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.25" />
24+
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.25" />
25+
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.25" />
26+
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.25" />
27+
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.25" />
28+
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.25" />
29+
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.25" />
30+
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.25" />
31+
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.25" />
32+
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.25" />
33+
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.25" />
3434
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
3535
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" />
3636
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.1" />
3737
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1" />
3838
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.1" />
3939
<Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.1" />
40-
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.24" />
41-
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.24" />
42-
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.24" />
43-
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.24" />
44-
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.24" />
45-
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.24" />
40+
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.25" />
41+
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.25" />
42+
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.25" />
43+
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.25" />
44+
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.25" />
45+
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.25" />
4646
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.24" />
4747
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.24" />
48-
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.24" />
49-
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.24" />
50-
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.24" />
51-
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.24" />
52-
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.24" />
53-
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.24" />
54-
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.24" />
55-
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.24" />
56-
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.24" />
57-
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.24" />
58-
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.24" />
59-
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.24" />
60-
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.24" />
61-
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.24" />
62-
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.24" />
63-
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.24" />
64-
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.24" />
65-
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.24" />
66-
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.24" />
67-
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.24" />
68-
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.24" />
69-
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.24" />
70-
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.24" />
71-
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.24" />
72-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.24" />
73-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.24" />
74-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.24" />
75-
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.24" />
76-
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.24" />
77-
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.24" />
78-
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.24" />
79-
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.24" />
80-
<Package Id="Microsoft.dotnet-openapi" Version="3.1.24" />
81-
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.24" />
82-
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.24" />
83-
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.24" />
84-
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.24" />
85-
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.24" />
86-
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.24" />
87-
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.24" />
88-
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.24" />
89-
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.24" />
48+
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.25" />
49+
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.25" />
50+
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.25" />
51+
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.25" />
52+
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.25" />
53+
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.25" />
54+
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.25" />
55+
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.25" />
56+
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.25" />
57+
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.25" />
58+
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.25" />
59+
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.25" />
60+
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.25" />
61+
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.25" />
62+
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.25" />
63+
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.25" />
64+
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.25" />
65+
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.25" />
66+
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.25" />
67+
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.25" />
68+
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.25" />
69+
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.25" />
70+
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.25" />
71+
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.25" />
72+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.25" />
73+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.25" />
74+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.25" />
75+
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.25" />
76+
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.25" />
77+
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.25" />
78+
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.25" />
79+
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.25" />
80+
<Package Id="Microsoft.dotnet-openapi" Version="3.1.25" />
81+
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.25" />
82+
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.25" />
83+
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.25" />
84+
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.25" />
85+
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.25" />
86+
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.25" />
87+
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.25" />
88+
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.25" />
89+
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.25" />
9090
</Baseline>

0 commit comments

Comments
 (0)