diff --git a/AspNetCore.sln b/AspNetCore.sln
index 4d728cb40f..d81f7566e4 100644
--- a/AspNetCore.sln
+++ b/AspNetCore.sln
@@ -263,10 +263,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authen
EndProject
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}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{583308EC-AF1F-4D92-A94B-BDE94EA842D3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureADB2CSample", "src\Azure\AzureAD\samples\AzureADB2CSample\AzureADB2CSample.csproj", "{F6030571-6F10-442C-BAA9-CFFDAAA5D00F}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{16653D2A-AC79-44ED-B908-2EEB58684C50}"
EndProject
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
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication", "src\Security\Authentication\Core\src\Microsoft.AspNetCore.Authentication.csproj", "{D47B73A3-740E-4B9A-B123-A42299F1F266}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureADSample", "src\Azure\AzureAD\samples\AzureADSample\AzureADSample.csproj", "{137E2185-A592-4E4D-B144-3A35418E3C4A}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cookies", "Cookies", "{14A4E3F5-04BB-4062-84AE-1A887C307B17}"
EndProject
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
{27DF3ACF-F3ED-4D76-BFCB-57251892ABC0}.Release|x64.Build.0 = Release|Any CPU
{27DF3ACF-F3ED-4D76-BFCB-57251892ABC0}.Release|x86.ActiveCfg = Release|Any CPU
{27DF3ACF-F3ED-4D76-BFCB-57251892ABC0}.Release|x86.Build.0 = Release|Any CPU
- {F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Debug|x64.ActiveCfg = Debug|Any CPU
- {F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Debug|x64.Build.0 = Debug|Any CPU
- {F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Debug|x86.ActiveCfg = Debug|Any CPU
- {F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Debug|x86.Build.0 = Debug|Any CPU
- {F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Release|Any CPU.Build.0 = Release|Any CPU
- {F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Release|x64.ActiveCfg = Release|Any CPU
- {F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Release|x64.Build.0 = Release|Any CPU
- {F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Release|x86.ActiveCfg = Release|Any CPU
- {F6030571-6F10-442C-BAA9-CFFDAAA5D00F}.Release|x86.Build.0 = Release|Any CPU
{B70B1843-4360-4731-9D5C-599189CC1198}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B70B1843-4360-4731-9D5C-599189CC1198}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B70B1843-4360-4731-9D5C-599189CC1198}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -2395,18 +2377,6 @@ Global
{D47B73A3-740E-4B9A-B123-A42299F1F266}.Release|x64.Build.0 = Release|Any CPU
{D47B73A3-740E-4B9A-B123-A42299F1F266}.Release|x86.ActiveCfg = Release|Any CPU
{D47B73A3-740E-4B9A-B123-A42299F1F266}.Release|x86.Build.0 = Release|Any CPU
- {137E2185-A592-4E4D-B144-3A35418E3C4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {137E2185-A592-4E4D-B144-3A35418E3C4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {137E2185-A592-4E4D-B144-3A35418E3C4A}.Debug|x64.ActiveCfg = Debug|Any CPU
- {137E2185-A592-4E4D-B144-3A35418E3C4A}.Debug|x64.Build.0 = Debug|Any CPU
- {137E2185-A592-4E4D-B144-3A35418E3C4A}.Debug|x86.ActiveCfg = Debug|Any CPU
- {137E2185-A592-4E4D-B144-3A35418E3C4A}.Debug|x86.Build.0 = Debug|Any CPU
- {137E2185-A592-4E4D-B144-3A35418E3C4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {137E2185-A592-4E4D-B144-3A35418E3C4A}.Release|Any CPU.Build.0 = Release|Any CPU
- {137E2185-A592-4E4D-B144-3A35418E3C4A}.Release|x64.ActiveCfg = Release|Any CPU
- {137E2185-A592-4E4D-B144-3A35418E3C4A}.Release|x64.Build.0 = Release|Any CPU
- {137E2185-A592-4E4D-B144-3A35418E3C4A}.Release|x86.ActiveCfg = Release|Any CPU
- {137E2185-A592-4E4D-B144-3A35418E3C4A}.Release|x86.Build.0 = Release|Any CPU
{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -7052,8 +7022,6 @@ Global
{B95A22C8-71B7-49DE-94B2-16402A36B914} = {2757D342-5E89-4C4B-9659-714AC8536FD4}
{600BF48B-F5DF-4C9D-A5A7-635A8DD6C32A} = {B95A22C8-71B7-49DE-94B2-16402A36B914}
{27DF3ACF-F3ED-4D76-BFCB-57251892ABC0} = {B95A22C8-71B7-49DE-94B2-16402A36B914}
- {583308EC-AF1F-4D92-A94B-BDE94EA842D3} = {2757D342-5E89-4C4B-9659-714AC8536FD4}
- {F6030571-6F10-442C-BAA9-CFFDAAA5D00F} = {583308EC-AF1F-4D92-A94B-BDE94EA842D3}
{16653D2A-AC79-44ED-B908-2EEB58684C50} = {2757D342-5E89-4C4B-9659-714AC8536FD4}
{B70B1843-4360-4731-9D5C-599189CC1198} = {16653D2A-AC79-44ED-B908-2EEB58684C50}
{4FDDC525-4E60-4CAF-83A3-261C5B43721F} = {0ACCEDA7-339C-4B4D-8DD4-1AC271F31C04}
@@ -7091,7 +7059,6 @@ Global
{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9} = {9121A7EA-5751-4811-9FE3-E183BB8709FB}
{03CD847C-2230-4092-BF1C-DE54634805AD} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
{D47B73A3-740E-4B9A-B123-A42299F1F266} = {03CD847C-2230-4092-BF1C-DE54634805AD}
- {137E2185-A592-4E4D-B144-3A35418E3C4A} = {583308EC-AF1F-4D92-A94B-BDE94EA842D3}
{14A4E3F5-04BB-4062-84AE-1A887C307B17} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
{6906D7DE-CE06-4A6A-81BB-D783C605A184} = {14A4E3F5-04BB-4062-84AE-1A887C307B17}
{2AB4FE8F-94FF-4C6E-B12F-9E40A9FAF9AB} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index 081db9be88..35853a5024 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -163,6 +163,8 @@ and are generated based on the last package release.
+
+
diff --git a/eng/Versions.props b/eng/Versions.props
index d11516a861..5c29d43ef5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -256,6 +256,9 @@
3.0.03.0.02.1.90
+ 0.2.0-preview
+ 0.2.0-preview
+ 3.8.0$(MessagePackPackageVersion)4.10.00.11.2
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Controllers/AccountController.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Controllers/AccountController.cs
index 95d1d045d2..c728ee4e49 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Controllers/AccountController.cs
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Controllers/AccountController.cs
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
+using System;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
@@ -11,6 +12,7 @@ namespace Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureAD.Controllers.Int
[AllowAnonymous]
[Area("AzureAD")]
[Route("[area]/[controller]/[action]")]
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
internal class AccountController : Controller
{
public AccountController(IOptionsMonitor options)
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAccountControllerFeatureProvider.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAccountControllerFeatureProvider.cs
index ecfc3dab9b..41efc90242 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAccountControllerFeatureProvider.cs
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAccountControllerFeatureProvider.cs
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
+using System;
using System.Collections.Generic;
using System.Reflection;
using Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureAD.Controllers.Internal;
@@ -9,6 +10,7 @@ using Microsoft.AspNetCore.Mvc.Controllers;
namespace Microsoft.AspNetCore.Authentication.AzureAD.UI
{
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
internal class AzureADAccountControllerFeatureProvider : IApplicationFeatureProvider, IApplicationFeatureProvider
{
public void PopulateFeature(IEnumerable parts, ControllerFeature feature)
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs
index 2337ddc840..dcc93dd7de 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs
@@ -18,6 +18,7 @@ namespace Microsoft.AspNetCore.Authentication
///
/// Extension methods to add Azure Active Directory Authentication to your application.
///
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
public static class AzureADAuthenticationBuilderExtensions
{
///
@@ -28,6 +29,7 @@ namespace Microsoft.AspNetCore.Authentication
/// .
///
/// The .
+ [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.")]
public static AuthenticationBuilder AddAzureADBearer(this AuthenticationBuilder builder, Action configureOptions) =>
builder.AddAzureADBearer(
AzureADDefaults.BearerAuthenticationScheme,
@@ -44,6 +46,7 @@ namespace Microsoft.AspNetCore.Authentication
/// .
///
/// The .
+ [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.")]
public static AuthenticationBuilder AddAzureADBearer(
this AuthenticationBuilder builder,
string scheme,
@@ -78,6 +81,7 @@ namespace Microsoft.AspNetCore.Authentication
///
///
/// The .
+ [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.")]
public static AuthenticationBuilder AddAzureAD(this AuthenticationBuilder builder, Action configureOptions) =>
builder.AddAzureAD(
AzureADDefaults.AuthenticationScheme,
@@ -98,6 +102,7 @@ namespace Microsoft.AspNetCore.Authentication
///
///
/// The .
+ [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.")]
public static AuthenticationBuilder AddAzureAD(
this AuthenticationBuilder builder,
string scheme,
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADCookieOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADCookieOptionsConfiguration.cs
index 6d0116921e..607d0f78ed 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADCookieOptionsConfiguration.cs
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADCookieOptionsConfiguration.cs
@@ -1,12 +1,14 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
+using System;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Options;
namespace Microsoft.AspNetCore.Authentication.AzureAD.UI
{
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
internal class AzureADCookieOptionsConfiguration : IConfigureNamedOptions
{
private readonly IOptions _schemeOptions;
@@ -25,7 +27,7 @@ namespace Microsoft.AspNetCore.Authentication.AzureAD.UI
{
return;
}
-
+
var AzureADOptions = _AzureADOptions.Get(AzureADScheme);
if (name != AzureADOptions.CookieSchemeName)
{
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADDefaults.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADDefaults.cs
index a344514155..c4d2196701 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADDefaults.cs
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADDefaults.cs
@@ -1,14 +1,16 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
+using System;
namespace Microsoft.AspNetCore.Authentication.AzureAD.UI
{
///
/// Constants for different Azure Active Directory authentication components.
///
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
public static class AzureADDefaults
- {
+ {
///
/// The scheme name for Open ID Connect when using
/// .
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADJwtBearerOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADJwtBearerOptionsConfiguration.cs
index 75337b2cc4..5dbc09ee63 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADJwtBearerOptionsConfiguration.cs
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADJwtBearerOptionsConfiguration.cs
@@ -8,6 +8,7 @@ using Microsoft.Extensions.Options;
namespace Microsoft.AspNetCore.Authentication
{
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
internal class AzureADJwtBearerOptionsConfiguration : IConfigureNamedOptions
{
private readonly IOptions _schemeOptions;
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs
index 9b5be26438..bea7de4480 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs
@@ -7,6 +7,7 @@ using Microsoft.Extensions.Options;
namespace Microsoft.AspNetCore.Authentication.AzureAD.UI
{
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
internal class AzureADOpenIdConnectOptionsConfiguration : IConfigureNamedOptions
{
private readonly IOptions _schemeOptions;
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptions.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptions.cs
index 462dc5a8a4..e871449927 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptions.cs
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptions.cs
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
+using System;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
@@ -9,6 +10,7 @@ namespace Microsoft.AspNetCore.Authentication.AzureAD.UI
///
/// Options for configuring authentication using Azure Active Directory.
///
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
public class AzureADOptions
{
///
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsConfiguration.cs
index 9eceb5f3cb..ba91b5f59d 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsConfiguration.cs
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsConfiguration.cs
@@ -1,10 +1,12 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
+using System;
using Microsoft.Extensions.Options;
namespace Microsoft.AspNetCore.Authentication.AzureAD.UI
{
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
internal class AzureADOptionsConfiguration : IConfigureNamedOptions
{
private readonly IOptions _schemeOptions;
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsValidation.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsValidation.cs
index 9b551d4dd8..5edde29942 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsValidation.cs
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsValidation.cs
@@ -1,10 +1,12 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
+using System;
using Microsoft.Extensions.Options;
namespace Microsoft.AspNetCore.Authentication.AzureAD.UI
{
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
internal class AzureADOptionsValidation : IValidateOptions
{
public ValidateOptionsResult Validate(string name, AzureADOptions options)
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj
index 1087f46745..b5daa435a5 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj
@@ -3,6 +3,8 @@
$(DefaultNetCoreTargetFramework)Microsoft.AspNetCore.Authentication.AzureAD.UI
+
+ $(NoWarn);CS0618
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Controllers/AccountController.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Controllers/AccountController.cs
index 84972e6f53..387ae4c6b0 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Controllers/AccountController.cs
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Controllers/AccountController.cs
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
+using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
@@ -13,6 +14,7 @@ namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2C.Controlle
[AllowAnonymous]
[Area("AzureADB2C")]
[Route("[area]/[controller]/[action]")]
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
internal class AccountController : Controller
{
private readonly IOptionsMonitor _options;
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CAccountControllerFeatureProvider.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CAccountControllerFeatureProvider.cs
index c1067908ee..b6b639a796 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CAccountControllerFeatureProvider.cs
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CAccountControllerFeatureProvider.cs
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
+using System;
using System.Collections.Generic;
using System.Reflection;
using Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2C.Controllers.Internal;
@@ -9,6 +10,7 @@ using Microsoft.AspNetCore.Mvc.Controllers;
namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI
{
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
internal class AzureADB2CAccountControllerFeatureProvider : IApplicationFeatureProvider, IApplicationFeatureProvider
{
public void PopulateFeature(IEnumerable parts, ControllerFeature feature)
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CCookieOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CCookieOptionsConfiguration.cs
index 2f20345111..257e809631 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CCookieOptionsConfiguration.cs
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CCookieOptionsConfiguration.cs
@@ -1,12 +1,14 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
+using System;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Options;
namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI
{
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
internal class AzureADB2CCookieOptionsConfiguration : IConfigureNamedOptions
{
private readonly IOptions _schemeOptions;
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CJwtBearerOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CJwtBearerOptionsConfiguration.cs
index c916c4f439..2be6706b28 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CJwtBearerOptionsConfiguration.cs
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CJwtBearerOptionsConfiguration.cs
@@ -1,12 +1,14 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
+using System;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Authentication.AzureADB2C.UI;
using Microsoft.Extensions.Options;
namespace Microsoft.AspNetCore.Authentication
{
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
internal class AzureADB2CJwtBearerOptionsConfiguration : IConfigureNamedOptions
{
private readonly IOptions _schemeOptions;
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2COpenIdConnectOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2COpenIdConnectOptionsConfiguration.cs
index 1a90ee8618..e03badf981 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2COpenIdConnectOptionsConfiguration.cs
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2COpenIdConnectOptionsConfiguration.cs
@@ -9,6 +9,7 @@ using Microsoft.IdentityModel.Tokens;
namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI
{
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
internal class AzureADB2COpenIdConnectOptionsConfiguration : IConfigureNamedOptions
{
private readonly IOptions _schemeOptions;
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CAuthenticationBuilderExtensions.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CAuthenticationBuilderExtensions.cs
index 1d344398b9..2b70aa9b48 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CAuthenticationBuilderExtensions.cs
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CAuthenticationBuilderExtensions.cs
@@ -20,6 +20,7 @@ namespace Microsoft.AspNetCore.Authentication
///
/// Extension methods to add Azure Active Directory B2C Authentication to your application.
///
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
public static class AzureADB2CAuthenticationBuilderExtensions
{
///
@@ -30,6 +31,7 @@ namespace Microsoft.AspNetCore.Authentication
/// .
///
/// The .
+ [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.")]
public static AuthenticationBuilder AddAzureADB2CBearer(this AuthenticationBuilder builder, Action configureOptions) =>
builder.AddAzureADB2CBearer(
AzureADB2CDefaults.BearerAuthenticationScheme,
@@ -46,6 +48,7 @@ namespace Microsoft.AspNetCore.Authentication
/// .
///
/// The .
+ [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.")]
public static AuthenticationBuilder AddAzureADB2CBearer(
this AuthenticationBuilder builder,
string scheme,
@@ -77,6 +80,7 @@ namespace Microsoft.AspNetCore.Authentication
///
///
/// The .
+ [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.")]
public static AuthenticationBuilder AddAzureADB2C(this AuthenticationBuilder builder, Action configureOptions) =>
builder.AddAzureADB2C(
AzureADB2CDefaults.AuthenticationScheme,
@@ -97,6 +101,7 @@ namespace Microsoft.AspNetCore.Authentication
///
///
/// The .
+ [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.")]
public static AuthenticationBuilder AddAzureADB2C(
this AuthenticationBuilder builder,
string scheme,
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CDefaults.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CDefaults.cs
index 769eea589b..6d95f08d0e 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CDefaults.cs
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CDefaults.cs
@@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
-
+using System;
using Microsoft.AspNetCore.Authentication;
namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI
@@ -9,13 +9,14 @@ namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI
///
/// Constants for different Azure Active Directory B2C authentication components.
///
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
public static class AzureADB2CDefaults
{
///
/// The key for the policy used in .
///
public static readonly string PolicyKey = "Policy";
-
+
///
/// The scheme name for Open ID Connect when using
/// .
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COpenIDConnectEventHandlers.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COpenIDConnectEventHandlers.cs
index d8d8b1c268..5c9a758db7 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COpenIDConnectEventHandlers.cs
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COpenIDConnectEventHandlers.cs
@@ -10,6 +10,7 @@ using Microsoft.IdentityModel.Protocols.OpenIdConnect;
namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI
{
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
internal class AzureADB2COpenIDConnectEventHandlers
{
private IDictionary _policyToIssuerAddress =
@@ -55,7 +56,7 @@ namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI
public Task OnRemoteFailure(RemoteFailureContext context)
{
context.HandleResponse();
- // Handle the error code that Azure Active Directory B2C throws when trying to reset a password from the login page
+ // Handle the error code that Azure Active Directory B2C throws when trying to reset a password from the login page
// because password reset is not supported by a "sign-up or sign-in policy".
// Below is a sample error message:
// 'access_denied', error_description: 'AADB2C90118: The user has forgotten their password.
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptions.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptions.cs
index 6743d3b5fa..eb0d95d53a 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptions.cs
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptions.cs
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
+using System;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
@@ -9,6 +10,7 @@ namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI
///
/// Options for configuring authentication using Azure Active Directory B2C.
///
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
public class AzureADB2COptions
{
///
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptionsConfiguration.cs
index 712ad7b4ad..bad360b960 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptionsConfiguration.cs
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptionsConfiguration.cs
@@ -1,10 +1,12 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
+using System;
using Microsoft.Extensions.Options;
namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI
{
+ [Obsolete("This is obsolete and will be removed in a future version. Use Microsoft.Identity.Web instead. See https://aka.ms/ms-identity-web.")]
internal class AzureADB2COptionsConfiguration : IConfigureNamedOptions
{
private readonly IOptions _schemeOptions;
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj
index 7d0ea17f83..65c330077b 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj
@@ -3,6 +3,8 @@
$(DefaultNetCoreTargetFramework)Microsoft.AspNetCore.Authentication.AzureADB2C.UI
+
+ $(NoWarn);CS0618
diff --git a/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj b/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj
deleted file mode 100644
index 379bc01e8d..0000000000
--- a/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- $(DefaultNetCoreTargetFramework)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/About.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/About.cshtml
deleted file mode 100644
index 43c5750248..0000000000
--- a/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/About.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-@page
-@model AzureADB2CSample.Pages.AboutModel
-@{
-}
diff --git a/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/About.cshtml.cs b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/About.cshtml.cs
deleted file mode 100644
index 925d01223e..0000000000
--- a/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/About.cshtml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-
-namespace AzureADB2CSample.Pages
-{
- public class AboutModel : PageModel
- {
- public void OnGet()
- {
- }
- }
-}
diff --git a/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml
deleted file mode 100644
index 44a7323c75..0000000000
--- a/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml
+++ /dev/null
@@ -1,10 +0,0 @@
-@page
-@model IndexModel
-@{
- ViewData["Title"] = "Home page";
-}
-
-