Skip to content

Commit ed9925d

Browse files
TanayParikhTanayParikh
committed
Merge branch 'merge/release/5.0-preview8-to-master' of https://github.com/dotnet-maestro-bot/AspNetCore into merge/release/5.0-preview8-to-master
2 parents f269428 + dc53cd0 commit ed9925d

File tree

153 files changed

+1254
-38770
lines changed

Some content is hidden

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

153 files changed

+1254
-38770
lines changed

‎AspNetCore.sln

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authen
263263
EndProject
264264
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test", "src\Azure\AzureAD\Authentication.AzureADB2C.UI\test\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj", "{27DF3ACF-F3ED-4D76-BFCB-57251892ABC0}"
265265
EndProject
266-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{583308EC-AF1F-4D92-A94B-BDE94EA842D3}"
267-
EndProject
268-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureADB2CSample", "src\Azure\AzureAD\samples\AzureADB2CSample\AzureADB2CSample.csproj", "{F6030571-6F10-442C-BAA9-CFFDAAA5D00F}"
269-
EndProject
270266
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{16653D2A-AC79-44ED-B908-2EEB58684C50}"
271267
EndProject
272268
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests", "src\Azure\AzureAD\test\FunctionalTests\Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj", "{B70B1843-4360-4731-9D5C-599189CC1198}"
@@ -341,8 +337,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{03CD847C-2
341337
EndProject
342338
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication", "src\Security\Authentication\Core\src\Microsoft.AspNetCore.Authentication.csproj", "{D47B73A3-740E-4B9A-B123-A42299F1F266}"
343339
EndProject
344-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureADSample", "src\Azure\AzureAD\samples\AzureADSample\AzureADSample.csproj", "{137E2185-A592-4E4D-B144-3A35418E3C4A}"
345-
EndProject
346340
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cookies", "Cookies", "{14A4E3F5-04BB-4062-84AE-1A887C307B17}"
347341
EndProject
348342
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "src\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{6906D7DE-CE06-4A6A-81BB-D783C605A184}"
@@ -2167,18 +2161,6 @@ Global
21672161
{27DF3ACF-F3ED-4D76-BFCB-57251892ABC0}.Release|x64.Build.0 = Release|Any CPU
21682162
{27DF3ACF-F3ED-4D76-BFCB-57251892ABC0}.Release|x86.ActiveCfg = Release|Any CPU
21692163
{27DF3ACF-F3ED-4D76-BFCB-57251892ABC0}.Release|x86.Build.0 = Release|Any CPU
2170-
{F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2171-
{F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Debug|Any CPU.Build.0 = Debug|Any CPU
2172-
{F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Debug|x64.ActiveCfg = Debug|Any CPU
2173-
{F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Debug|x64.Build.0 = Debug|Any CPU
2174-
{F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Debug|x86.ActiveCfg = Debug|Any CPU
2175-
{F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Debug|x86.Build.0 = Debug|Any CPU
2176-
{F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Release|Any CPU.ActiveCfg = Release|Any CPU
2177-
{F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Release|Any CPU.Build.0 = Release|Any CPU
2178-
{F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Release|x64.ActiveCfg = Release|Any CPU
2179-
{F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Release|x64.Build.0 = Release|Any CPU
2180-
{F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Release|x86.ActiveCfg = Release|Any CPU
2181-
{F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Release|x86.Build.0 = Release|Any CPU
21822164
{B70B1843-4360-4731-9D5C-599189CC1198}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21832165
{B70B1843-4360-4731-9D5C-599189CC1198}.Debug|Any CPU.Build.0 = Debug|Any CPU
21842166
{B70B1843-4360-4731-9D5C-599189CC1198}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -2395,18 +2377,6 @@ Global
23952377
{D47B73A3-740E-4B9A-B123-A42299F1F266}.Release|x64.Build.0 = Release|Any CPU
23962378
{D47B73A3-740E-4B9A-B123-A42299F1F266}.Release|x86.ActiveCfg = Release|Any CPU
23972379
{D47B73A3-740E-4B9A-B123-A42299F1F266}.Release|x86.Build.0 = Release|Any CPU
2398-
{137E2185-A592-4E4D-B144-3A35418E3C4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2399-
{137E2185-A592-4E4D-B144-3A35418E3C4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
2400-
{137E2185-A592-4E4D-B144-3A35418E3C4A}.Debug|x64.ActiveCfg = Debug|Any CPU
2401-
{137E2185-A592-4E4D-B144-3A35418E3C4A}.Debug|x64.Build.0 = Debug|Any CPU
2402-
{137E2185-A592-4E4D-B144-3A35418E3C4A}.Debug|x86.ActiveCfg = Debug|Any CPU
2403-
{137E2185-A592-4E4D-B144-3A35418E3C4A}.Debug|x86.Build.0 = Debug|Any CPU
2404-
{137E2185-A592-4E4D-B144-3A35418E3C4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
2405-
{137E2185-A592-4E4D-B144-3A35418E3C4A}.Release|Any CPU.Build.0 = Release|Any CPU
2406-
{137E2185-A592-4E4D-B144-3A35418E3C4A}.Release|x64.ActiveCfg = Release|Any CPU
2407-
{137E2185-A592-4E4D-B144-3A35418E3C4A}.Release|x64.Build.0 = Release|Any CPU
2408-
{137E2185-A592-4E4D-B144-3A35418E3C4A}.Release|x86.ActiveCfg = Release|Any CPU
2409-
{137E2185-A592-4E4D-B144-3A35418E3C4A}.Release|x86.Build.0 = Release|Any CPU
24102380
{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24112381
{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Debug|Any CPU.Build.0 = Debug|Any CPU
24122382
{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -7052,8 +7022,6 @@ Global
70527022
{B95A22C8-71B7-49DE-94B2-16402A36B914} = {2757D342-5E89-4C4B-9659-714AC8536FD4}
70537023
{600BF48B-F5DF-4C9D-A5A7-635A8DD6C32A} = {B95A22C8-71B7-49DE-94B2-16402A36B914}
70547024
{27DF3ACF-F3ED-4D76-BFCB-57251892ABC0} = {B95A22C8-71B7-49DE-94B2-16402A36B914}
7055-
{583308EC-AF1F-4D92-A94B-BDE94EA842D3} = {2757D342-5E89-4C4B-9659-714AC8536FD4}
7056-
{F6030571-6F10-442C-BAA9-CFFDAAA5D00F} = {583308EC-AF1F-4D92-A94B-BDE94EA842D3}
70577025
{16653D2A-AC79-44ED-B908-2EEB58684C50} = {2757D342-5E89-4C4B-9659-714AC8536FD4}
70587026
{B70B1843-4360-4731-9D5C-599189CC1198} = {16653D2A-AC79-44ED-B908-2EEB58684C50}
70597027
{4FDDC525-4E60-4CAF-83A3-261C5B43721F} = {0ACCEDA7-339C-4B4D-8DD4-1AC271F31C04}
@@ -7091,7 +7059,6 @@ Global
70917059
{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9} = {9121A7EA-5751-4811-9FE3-E183BB8709FB}
70927060
{03CD847C-2230-4092-BF1C-DE54634805AD} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
70937061
{D47B73A3-740E-4B9A-B123-A42299F1F266} = {03CD847C-2230-4092-BF1C-DE54634805AD}
7094-
{137E2185-A592-4E4D-B144-3A35418E3C4A} = {583308EC-AF1F-4D92-A94B-BDE94EA842D3}
70957062
{14A4E3F5-04BB-4062-84AE-1A887C307B17} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
70967063
{6906D7DE-CE06-4A6A-81BB-D783C605A184} = {14A4E3F5-04BB-4062-84AE-1A887C307B17}
70977064
{2AB4FE8F-94FF-4C6E-B12F-9E40A9FAF9AB} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}

‎eng/Dependencies.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ and are generated based on the last package release.
163163
<LatestPackageReference Include="MessagePack" />
164164
<LatestPackageReference Include="MessagePackAnalyzer" />
165165
<LatestPackageReference Include="Microsoft.Data.SqlClient" />
166+
<LatestPackageReference Include="Microsoft.Identity.Web.UI" />
167+
<LatestPackageReference Include="Microsoft.Graph" />
166168
<LatestPackageReference Include="Mono.Cecil" />
167169
<LatestPackageReference Include="Moq" />
168170
<LatestPackageReference Include="Newtonsoft.Json.Bson" />

‎eng/Versions.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,9 @@
256256
<IdentityServer4StoragePackageVersion>3.0.0</IdentityServer4StoragePackageVersion>
257257
<IdentityServer4EntityFrameworkStoragePackageVersion>3.0.0</IdentityServer4EntityFrameworkStoragePackageVersion>
258258
<MessagePackPackageVersion>2.1.90</MessagePackPackageVersion>
259+
<MicrosoftIdentityWebPackageVersion>0.2.0-preview</MicrosoftIdentityWebPackageVersion>
260+
<MicrosoftIdentityWebUIPackageVersion>0.2.0-preview</MicrosoftIdentityWebUIPackageVersion>
261+
<MicrosoftGraphPackageVersion>3.8.0</MicrosoftGraphPackageVersion>
259262
<MessagePackAnalyzerPackageVersion>$(MessagePackPackageVersion)</MessagePackAnalyzerPackageVersion>
260263
<MoqPackageVersion>4.10.0</MoqPackageVersion>
261264
<MonoCecilPackageVersion>0.11.2</MonoCecilPackageVersion>

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Controllers/AccountController.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
33

4+
using System;
45
using Microsoft.AspNetCore.Authorization;
56
using Microsoft.AspNetCore.Mvc;
67
using Microsoft.Extensions.Options;
@@ -11,6 +12,7 @@ namespace Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureAD.Controllers.Int
1112
[AllowAnonymous]
1213
[Area("AzureAD")]
1314
[Route("[area]/[controller]/[action]")]
15+
[Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
1416
internal class AccountController : Controller
1517
{
1618
public AccountController(IOptionsMonitor<AzureADOptions> options)

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAccountControllerFeatureProvider.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
33

4+
using System;
45
using System.Collections.Generic;
56
using System.Reflection;
67
using Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureAD.Controllers.Internal;
@@ -9,6 +10,7 @@
910

1011
namespace Microsoft.AspNetCore.Authentication.AzureAD.UI
1112
{
13+
[Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
1214
internal class AzureADAccountControllerFeatureProvider : IApplicationFeatureProvider<ControllerFeature>, IApplicationFeatureProvider
1315
{
1416
public void PopulateFeature(IEnumerable<ApplicationPart> parts, ControllerFeature feature)

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ namespace Microsoft.AspNetCore.Authentication
1818
/// <summary>
1919
/// Extension methods to add Azure Active Directory Authentication to your application.
2020
/// </summary>
21+
[Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
2122
public static class AzureADAuthenticationBuilderExtensions
2223
{
2324
/// <summary>
@@ -28,6 +29,7 @@ public static class AzureADAuthenticationBuilderExtensions
2829
/// <see cref="AzureADOptions"/>.
2930
/// </param>
3031
/// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
32+
[Obsolete("This is obsolete and will be removed in a future version. Use AddMicrosoftWebApiAuthentication from Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
3133
public static AuthenticationBuilder AddAzureADBearer(this AuthenticationBuilder builder, Action<AzureADOptions> configureOptions) =>
3234
builder.AddAzureADBearer(
3335
AzureADDefaults.BearerAuthenticationScheme,
@@ -44,6 +46,7 @@ public static AuthenticationBuilder AddAzureADBearer(this AuthenticationBuilder
4446
/// <see cref="AzureADOptions"/>.
4547
/// </param>
4648
/// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
49+
[Obsolete("This is obsolete and will be removed in a future version. Use AddMicrosoftWebApiAuthentication from Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
4750
public static AuthenticationBuilder AddAzureADBearer(
4851
this AuthenticationBuilder builder,
4952
string scheme,
@@ -78,6 +81,7 @@ public static AuthenticationBuilder AddAzureADBearer(
7881
/// <see cref="AzureADOptions"/>
7982
/// </param>
8083
/// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
84+
[Obsolete("This is obsolete and will be removed in a future version. Use AddMicrosoftWebApiAuthentication from Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
8185
public static AuthenticationBuilder AddAzureAD(this AuthenticationBuilder builder, Action<AzureADOptions> configureOptions) =>
8286
builder.AddAzureAD(
8387
AzureADDefaults.AuthenticationScheme,
@@ -98,6 +102,7 @@ public static AuthenticationBuilder AddAzureAD(this AuthenticationBuilder builde
98102
/// <see cref="AzureADOptions"/>
99103
/// </param>
100104
/// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
105+
[Obsolete("This is obsolete and will be removed in a future version. Use AddMicrosoftWebApiAuthentication from Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
101106
public static AuthenticationBuilder AddAzureAD(
102107
this AuthenticationBuilder builder,
103108
string scheme,

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADCookieOptionsConfiguration.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
33

4+
using System;
45
using Microsoft.AspNetCore.Authentication.Cookies;
56
using Microsoft.AspNetCore.Http;
67
using Microsoft.Extensions.Options;
78

89
namespace Microsoft.AspNetCore.Authentication.AzureAD.UI
910
{
11+
[Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
1012
internal class AzureADCookieOptionsConfiguration : IConfigureNamedOptions<CookieAuthenticationOptions>
1113
{
1214
private readonly IOptions<AzureADSchemeOptions> _schemeOptions;
@@ -25,7 +27,7 @@ public void Configure(string name, CookieAuthenticationOptions options)
2527
{
2628
return;
2729
}
28-
30+
2931
var AzureADOptions = _AzureADOptions.Get(AzureADScheme);
3032
if (name != AzureADOptions.CookieSchemeName)
3133
{

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADDefaults.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
33

4+
using System;
45

56
namespace Microsoft.AspNetCore.Authentication.AzureAD.UI
67
{
78
/// <summary>
89
/// Constants for different Azure Active Directory authentication components.
910
/// </summary>
11+
[Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
1012
public static class AzureADDefaults
11-
{
13+
{
1214
/// <summary>
1315
/// The scheme name for Open ID Connect when using
1416
/// <see cref="AzureADAuthenticationBuilderExtensions.AddAzureAD(AuthenticationBuilder, System.Action{AzureADOptions})"/>.

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADJwtBearerOptionsConfiguration.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
namespace Microsoft.AspNetCore.Authentication
1010
{
11+
[Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
1112
internal class AzureADJwtBearerOptionsConfiguration : IConfigureNamedOptions<JwtBearerOptions>
1213
{
1314
private readonly IOptions<AzureADSchemeOptions> _schemeOptions;

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace Microsoft.AspNetCore.Authentication.AzureAD.UI
99
{
10+
[Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
1011
internal class AzureADOpenIdConnectOptionsConfiguration : IConfigureNamedOptions<OpenIdConnectOptions>
1112
{
1213
private readonly IOptions<AzureADSchemeOptions> _schemeOptions;

0 commit comments

Comments
 (0)