Update RazorPages, MVC, WebApi templates to use Identity.Web

AspNetCore.sln

@@ -263,10 +263,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Authen
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Authentication", "src\Security\Authentication\Core\src\Microsoft.AspNetCore.Authentication.csproj", "{D47B73A3-740E-4B9A-B123-A42299F1F266}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Authentication.Cookies", "src\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{6906D7DE-CE06-4A6A-81BB-D783C605A184}"
@@ -2143,18 +2137,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
@@ -2371,18 +2353,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
@@ -6920,8 +6890,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}
@@ -6959,7 +6927,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}

eng/Dependencies.props

@@ -159,6 +159,8 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Libuv" />
     <LatestPackageReference Include="MessagePack" />
     <LatestPackageReference Include="MessagePackAnalyzer" />
+    <LatestPackageReference Include="Microsoft.Identity.Web.UI" />
+    <LatestPackageReference Include="Microsoft.Graph" />
     <LatestPackageReference Include="Mono.Cecil" />
     <LatestPackageReference Include="Moq" />
     <LatestPackageReference Include="Newtonsoft.Json.Bson" />

eng/Versions.props

@@ -247,6 +247,9 @@
     <IdentityServer4StoragePackageVersion>3.0.0</IdentityServer4StoragePackageVersion>
     <IdentityServer4EntityFrameworkStoragePackageVersion>3.0.0</IdentityServer4EntityFrameworkStoragePackageVersion>
     <MessagePackPackageVersion>2.1.90</MessagePackPackageVersion>
+    <MicrosoftIdentityWebPackageVersion>0.2.0-preview</MicrosoftIdentityWebPackageVersion>
+    <MicrosoftIdentityWebUIPackageVersion>0.2.0-preview</MicrosoftIdentityWebUIPackageVersion>
+    <MicrosoftGraphPackageVersion>3.8.0</MicrosoftGraphPackageVersion>
     <MessagePackAnalyzerPackageVersion>$(MessagePackPackageVersion)</MessagePackAnalyzerPackageVersion>
     <MoqPackageVersion>4.10.0</MoqPackageVersion>
     <MonoCecilPackageVersion>0.11.2</MonoCecilPackageVersion>

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<AzureADOptions> options)

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 @@
 
 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<ControllerFeature>, IApplicationFeatureProvider
     {
         public void PopulateFeature(IEnumerable<ApplicationPart> parts, ControllerFeature feature)

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

@@ -18,6 +18,7 @@ namespace Microsoft.AspNetCore.Authentication
     /// <summary>
     /// Extension methods to add Azure Active Directory Authentication to your application.
     /// </summary>
+    [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
     {
         /// <summary>
@@ -28,6 +29,7 @@ public static class AzureADAuthenticationBuilderExtensions
         /// <see cref="AzureADOptions"/>.
         /// </param>
         /// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
+        [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<AzureADOptions> configureOptions) =>
             builder.AddAzureADBearer(
                 AzureADDefaults.BearerAuthenticationScheme,
@@ -44,6 +46,7 @@ public static AuthenticationBuilder AddAzureADBearer(this AuthenticationBuilder
         /// <see cref="AzureADOptions"/>.
         /// </param>
         /// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
+        [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 @@ public static AuthenticationBuilder AddAzureADBearer(
         /// <see cref="AzureADOptions"/>
         /// </param>
         /// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
+        [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<AzureADOptions> configureOptions) =>
             builder.AddAzureAD(
                 AzureADDefaults.AuthenticationScheme,
@@ -98,6 +102,7 @@ public static AuthenticationBuilder AddAzureAD(this AuthenticationBuilder builde
         /// <see cref="AzureADOptions"/>
         /// </param>
         /// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
+        [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,

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<CookieAuthenticationOptions>
     {
         private readonly IOptions<AzureADSchemeOptions> _schemeOptions;
@@ -25,7 +27,7 @@ public void Configure(string name, CookieAuthenticationOptions options)
             {
                 return;
             }
-            
+
             var AzureADOptions = _AzureADOptions.Get(AzureADScheme);
             if (name != AzureADOptions.CookieSchemeName)
             {

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
 {
     /// <summary>
     /// Constants for different Azure Active Directory authentication components.
     /// </summary>
+    [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
-    {        
+    {
         /// <summary>
         /// The scheme name for Open ID Connect when using
         /// <see cref="AzureADAuthenticationBuilderExtensions.AddAzureAD(AuthenticationBuilder, System.Action{AzureADOptions})"/>.

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

@@ -8,6 +8,7 @@
 
 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<JwtBearerOptions>
     {
         private readonly IOptions<AzureADSchemeOptions> _schemeOptions;

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

@@ -7,6 +7,7 @@
 
 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<OpenIdConnectOptions>
     {
         private readonly IOptions<AzureADSchemeOptions> _schemeOptions;

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
     /// <summary>
     /// Options for configuring authentication using Azure Active Directory.
     /// </summary>
+    [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
     {
         /// <summary>

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<AzureADOptions>
     {
         private readonly IOptions<AzureADSchemeOptions> _schemeOptions;

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<AzureADOptions>
     {
         public ValidateOptionsResult Validate(string name, AzureADOptions options)

src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj

@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <RootNamespace>Microsoft.AspNetCore.Authentication.AzureAD.UI</RootNamespace>
+    <!-- This package will be deprecated -->
+    <NoWarn>$(NoWarn);CS0618</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

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<AzureADB2COptions> _options;

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 @@
 
 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<ControllerFeature>, IApplicationFeatureProvider
     {
         public void PopulateFeature(IEnumerable<ApplicationPart> parts, ControllerFeature feature)

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<CookieAuthenticationOptions>
     {
         private readonly IOptions<AzureADB2CSchemeOptions> _schemeOptions;