Skip to content

Commit b04e90f

Browse files
captainsafiacaptainsafia
authored
Merge branch 'release/5.0' into safia/fix-identity-package
2 parents f62de0a + 098be5f commit b04e90f

File tree

776 files changed

+25939
-8531
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

776 files changed

+25939
-8531
lines changed

‎.azure/pipelines/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,8 @@ stages:
517517
jobDisplayName: "Test: Windows Server 2016 x64"
518518
agentOs: Windows
519519
isTestingJob: true
520+
# Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
521+
cancelTimeoutInMinutes: 30
520522
buildArgs: -all -pack -test /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
521523
/p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false
522524
$(_InternalRuntimeDownloadArgs)

‎.github/workflows/runtime-sync.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ jobs:
2121
# Test this script using changes in a fork
2222
repository: 'dotnet/aspnetcore'
2323
path: aspnetcore
24+
ref: release/5.0
2425
- name: Checkout runtime
2526
uses: actions/[email protected]
2627
with:
2728
# Test this script using changes in a fork
2829
repository: 'dotnet/runtime'
2930
path: runtime
31+
ref: release/5.0
3032
- name: Copy
3133
shell: cmd
3234
working-directory: .\runtime\src\libraries\Common\src\System\Net\Http\aspnetcore\
@@ -65,5 +67,6 @@ jobs:
6567
title: 'Sync shared code from runtime'
6668
body: 'This PR was automatically generated to sync shared code changes from runtime. Fixes #18943'
6769
labels: area-servers
70+
base: release/5.0
6871
branch: github-action/sync-runtime
6972
branch-suffix: timestamp

‎AspNetCore.sln‎

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

‎Directory.Build.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@
100100

101101
<!-- xUnit1004 = warns about skipped tests. Make this a non-fatal build warning. -->
102102
<WarningsNotAsErrors>$(WarningsNotAsErrors);xUnit1004</WarningsNotAsErrors>
103-
104-
<!-- Ignore specific Roslyn warnings for now, https://github.com/dotnet/aspnetcore/issues/22090 -->
105-
<NoWarn Condition="'$(IsAnalyzersProject)' == 'true'">$(NoWarn);RS1024;RS1025;RS1026</NoWarn>
106103
</PropertyGroup>
107104

108105
<!-- Source code settings -->

‎NuGet.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@
1212
<!-- Used for the SiteExtension 3.1 bits that are included in the 5.0 build -->
1313
<add key="dotnet31-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
1414
</packageSources>
15+
<disabledPackageSources />
1516
</configuration>

‎THIRD-PARTY-NOTICES.txt‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,4 +267,29 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
267267
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
268268
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
269269
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
270-
SOFTWARE.
270+
SOFTWARE.
271+
272+
License notice for BedrockFramework
273+
===================================
274+
275+
MIT License
276+
277+
Copyright (c) 2019 David Fowler
278+
279+
Permission is hereby granted, free of charge, to any person obtaining a copy
280+
of this software and associated documentation files (the "Software"), to deal
281+
in the Software without restriction, including without limitation the rights
282+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
283+
copies of the Software, and to permit persons to whom the Software is
284+
furnished to do so, subject to the following conditions:
285+
286+
The above copyright notice and this permission notice shall be included in all
287+
copies or substantial portions of the Software.
288+
289+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
290+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
291+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
292+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
293+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
294+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
295+
SOFTWARE.

‎eng/Baseline.Designer.props‎

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

‎eng/Baseline.xml‎

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

‎eng/Dependencies.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ and are generated based on the last package release.
6464
<LatestPackageReference Include="System.ComponentModel.Annotations" />
6565
<LatestPackageReference Include="System.Diagnostics.DiagnosticSource" />
6666
<LatestPackageReference Include="System.Diagnostics.EventLog" />
67+
<LatestPackageReference Include="System.DirectoryServices.Protocols" />
6768
<LatestPackageReference Include="System.Drawing.Common" />
6869
<LatestPackageReference Include="System.IO.Pipelines" />
6970
<LatestPackageReference Include="System.Net.Http" />
@@ -107,6 +108,7 @@ and are generated based on the last package release.
107108
<LatestPackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
108109
<LatestPackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" />
109110
<LatestPackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" />
111+
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.Design" />
110112
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
111113
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
112114
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />

0 commit comments

Comments
 (0)