Skip to content

Commit dd62a69

Browse files
pranavkmpranavkm
committed
Merge remote-tracking branch 'origin/release/3.1' into prkrishn/merge-blazor-wasm
2 parents 11ac23c + 99e90f5 commit dd62a69

37 files changed

+4243
-4153
lines changed

‎eng/Baseline.Designer.props

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

‎eng/Baseline.xml

Lines changed: 74 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -4,93 +4,87 @@ 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="3.1.4">
7+
<Baseline Version="3.1.5">
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.4" />
10+
<Package Id="dotnet-sql-cache" Version="3.1.5" />
1111
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.0" />
12-
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.4" />
13-
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.4" />
14-
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.4" />
15-
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.4" />
16-
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.4" />
17-
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.4" />
18-
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.4" />
19-
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.4" />
20-
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.4" />
21-
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.4" />
22-
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.4" />
23-
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.4" />
24-
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.4" />
25-
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.4" />
26-
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.4" />
27-
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.4" />
28-
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.4" />
29-
<Package Id="Microsoft.AspNetCore.Blazor" Version="3.2.0-preview1.20073.1" />
30-
<Package Id="Microsoft.AspNetCore.Blazor.Build" Version="3.2.0-preview1.20073.1" />
31-
<Package Id="Microsoft.AspNetCore.Blazor.DevServer" Version="3.2.0-preview1.20073.1" />
32-
<Package Id="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview1.20073.1" />
33-
<Package Id="Microsoft.AspNetCore.Blazor.Server" Version="3.2.0-preview1.20073.1" />
34-
<Package Id="Microsoft.AspNetCore.Blazor.Templates" Version="3.2.0-preview1.20073.1" />
35-
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.4" />
36-
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.4" />
37-
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.4" />
38-
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.4" />
39-
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.4" />
12+
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.5" />
13+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.5" />
14+
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.5" />
15+
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.5" />
16+
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.5" />
17+
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.5" />
18+
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.5" />
19+
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.5" />
20+
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.5" />
21+
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.5" />
22+
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.5" />
23+
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.5" />
24+
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.5" />
25+
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.5" />
26+
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.5" />
27+
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.5" />
28+
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.5" />
29+
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.5" />
30+
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.5" />
31+
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.5" />
32+
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.5" />
33+
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.5" />
4034
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
4135
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" />
4236
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0" />
4337
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.0" />
4438
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.0" />
4539
<Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.0" />
46-
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.4" />
47-
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.4" />
48-
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.4" />
49-
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.4" />
50-
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.4" />
51-
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.4" />
52-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.4" />
53-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.4" />
54-
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.4" />
55-
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.4" />
56-
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.4" />
57-
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.4" />
58-
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.4" />
59-
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.4" />
60-
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.4" />
61-
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.4" />
62-
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.4" />
63-
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.4" />
64-
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.4" />
65-
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.4" />
66-
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.4" />
67-
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.4" />
68-
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.4" />
69-
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.4" />
70-
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.4" />
71-
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.4" />
72-
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.4" />
73-
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.4" />
74-
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.4" />
75-
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.4" />
76-
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.4" />
77-
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.4" />
78-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.4" />
79-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.4" />
80-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.4" />
81-
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.4" />
82-
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.4" />
83-
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.4" />
84-
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.4" />
85-
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.4" />
86-
<Package Id="Microsoft.dotnet-openapi" Version="3.1.4" />
87-
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.4" />
88-
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.4" />
89-
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.4" />
90-
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.4" />
91-
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.4" />
92-
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.4" />
93-
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.4" />
94-
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.4" />
95-
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.4" />
40+
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.5" />
41+
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.5" />
42+
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.5" />
43+
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.5" />
44+
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.5" />
45+
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.5" />
46+
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.5" />
47+
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.5" />
48+
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.5" />
49+
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.5" />
50+
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.5" />
51+
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.5" />
52+
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.5" />
53+
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.5" />
54+
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.5" />
55+
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.5" />
56+
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.5" />
57+
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.5" />
58+
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.5" />
59+
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.5" />
60+
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.5" />
61+
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.5" />
62+
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.5" />
63+
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.5" />
64+
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.5" />
65+
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.5" />
66+
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.5" />
67+
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.5" />
68+
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.5" />
69+
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.5" />
70+
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.5" />
71+
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.5" />
72+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.5" />
73+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.5" />
74+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.5" />
75+
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.5" />
76+
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.5" />
77+
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.5" />
78+
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.5" />
79+
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.5" />
80+
<Package Id="Microsoft.dotnet-openapi" Version="3.1.5" />
81+
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.5" />
82+
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.5" />
83+
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.5" />
84+
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.5" />
85+
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.5" />
86+
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.5" />
87+
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.5" />
88+
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.5" />
89+
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.5" />
9690
</Baseline>

‎eng/Build.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@
127127
the entire pattern will silently fail to evaluate correctly.
128128
-->
129129
<DotNetProjects Include="
130-
$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj;
131-
$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj;
130+
$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj;
131+
$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj;
132+
$(RepoRoot)src\Framework\App.Ref.Internal\src\Microsoft.AspNetCore.App.Ref.Internal.csproj;
132133
$(RepoRoot)src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj;
133134
$(RepoRoot)src\DefaultBuilder\**\*.*proj;
134135
$(RepoRoot)src\Features\JsonPatch\**\*.*proj;

0 commit comments

Comments
 (0)