Merge remote-tracking branch 'origin/release/2.2' into prkrishn/update-master

build/dependencies.props

@@ -72,6 +72,6 @@
     <XunitPackageVersion>2.3.1</XunitPackageVersion>
     <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
-  <PropertyGroup Label="Package Versions: Pinned" />
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
+  <PropertyGroup Label="Package Versions: Pinned" />
 </Project>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ConfirmEmail.cshtml

@@ -2,7 +2,7 @@
     ViewData["Title"] = "Confirm Email";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <div>
     <p>
         Thank you for confirming your email. Please <a asp-controller="Account" asp-action="Login">click here to log in</a>.

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ExternalLoginConfirmation.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <h3>Associate your @ViewData["LoginProvider"] account.</h3>
 
 <form asp-controller="Account" asp-action="ExternalLoginConfirmation" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ExternalLoginFailure.cshtml

@@ -3,6 +3,6 @@
 }
 
 <header>
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <p class="text-danger">Unsuccessful login with service.</p>
 </header>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml

@@ -2,7 +2,7 @@
     ViewData["Title"] = "Forgot Password Confirmation";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p>
     Please check your email to reset your password.
 </p>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Login.cshtml

@@ -10,7 +10,7 @@
     ViewData["Title"] = "Log in";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <div class="row">
     <div class="col-md-8">
         <section>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Register.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
     <h4>Create a new account.</h4>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ResetPassword.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Reset password";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="ResetPassword" method="post" class="form-horizontal">
     <h4>Reset your password.</h4>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/SendCode.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Send Verification Code";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="SendCode" asp-route-returnurl="@Model.ReturnUrl" method="post" class="form-horizontal">
     <input asp-for="RememberMe" type="hidden" />

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/VerifyCode.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Verify";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="VerifyCode" asp-route-returnurl="@Model.ReturnUrl" method="post" class="form-horizontal">
     <div asp-validation-summary="All" class="text-danger"></div>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddLogoutUri.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a logout uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <ul class="list-unstyled">
             <li class="h4">Name</li>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddRedirectUri.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a redirect uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <ul class="list-unstyled">
             <li class="h4">Name</li>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddScope.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a scope to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
     <ul class="list-unstyled">
         <li class="h4">Name</li>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Create.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Create your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <form asp-action="Create" method="post">

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateLogoutUri.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a logout uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateRedirectUri.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a redirect uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateScope.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a scope to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/EditScope.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Edit scope";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
     <ul class="list-unstyled">
         <li class="h4">Name</li>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/GenerateClientSecret.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Generate an application key";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
 
     <ul class="list-unstyled">

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/GeneratedClientSecret.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Application key successfully generated";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Index.cshtml

@@ -3,7 +3,7 @@
         ViewData["Title"] = "Manage your applications";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <p class="text-success">@ViewData["StatusMessage"]</p>
 
     <div>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RegenerateClientSecret.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Regenerate an application key";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
 
     <ul class="list-unstyled">

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveClientSecret.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Remove the application key";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
 
     <ul class="list-unstyled">

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/IdentityService/InvalidLogoutRedirect.cshtml

@@ -3,5 +3,5 @@
 @{
     ViewData["Title"] = "Invalid logout redirect";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-warning">@Model.ErrorDescription</p>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/IdentityService/SignedOut.cshtml

@@ -1,5 +1,5 @@
 @{
     ViewData["Title"] = "Signed Out";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">You have successfully signed out.</p>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/AddPhoneNumber.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Add Phone Number";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <form asp-controller="Manage" asp-action="AddPhoneNumber" method="post" class="form-horizontal">
     <h4>Add a phone number.</h4>
     <hr />

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/ChangePassword.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Change Password";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Manage" asp-action="ChangePassword" method="post" class="form-horizontal">
     <h4>Change Password</h4>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/Index.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Manage your account";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">@ViewData["StatusMessage"]</p>
 
 <div>

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/ManageLogins.cshtml

@@ -4,7 +4,7 @@
     ViewData["Title"] = "Manage your external logins";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <p class="text-success">@ViewData["StatusMessage"]</p>
 @if (Model.CurrentLogins.Count > 0)

samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/VerifyPhoneNumber.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Verify Phone Number";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Manage" asp-action="VerifyPhoneNumber" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
     <input asp-for="PhoneNumber" type="hidden" />

samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj

@@ -29,6 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

samples/IdentityOIDCWebApplicationSample/Views/Account/SignedOut.cshtml

@@ -1,5 +1,5 @@
 @{
     ViewData["Title"] = "Signed Out";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">You have successfully signed out.</p>

samples/IdentityOIDCWebApplicationSample/Views/Home/About.cshtml

@@ -1,7 +1,7 @@
 @{
     ViewData["Title"] = "About";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <h3>@ViewData["Message"]</h3>
 
 <p>Use this area to provide additional information.</p>

samples/IdentityOIDCWebApplicationSample/Views/Home/Contact.cshtml

@@ -1,7 +1,7 @@
 @{
     ViewData["Title"] = "Contact";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <h3>@ViewData["Message"]</h3>
 
 <address>

samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj

@@ -30,6 +30,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj

@@ -30,5 +30,6 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 </Project>

samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml

@@ -2,7 +2,7 @@
     ViewData["Title"] = "Confirm Email";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <div>
     <p>
         Thank you for confirming your email. Please <a asp-controller="Account" asp-action="Login">Click here to Log in</a>.

samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <h3>Associate your @ViewData["ProviderDisplayName"] account.</h3>
 
 <form asp-controller="Account" asp-action="ExternalLoginConfirmation" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal" role="form">

samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml

@@ -3,6 +3,6 @@
 }
 
 <header>
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <p class="text-danger">Unsuccessful login with service.</p>
 </header>

samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Forgot your password?";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p>
     For more information on how to enable reset password please see this <a href="http://go.microsoft.com/fwlink/?LinkID=532713">article</a>.
 </p>

samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml

@@ -2,7 +2,7 @@
     ViewData["Title"] = "Forgot Password Confirmation";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p>
     Please check your email to reset your password.
 </p>

samples/IdentitySample.Mvc/Views/Account/Login.cshtml

@@ -8,7 +8,7 @@
     ViewData["Title"] = "Log in";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <div class="row">
     <div class="col-md-8">
         <section>

samples/IdentitySample.Mvc/Views/Account/Register.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal" role="form">
     <h4>Create a new account.</h4>

samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Reset password";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="ResetPassword" method="post" class="form-horizontal" role="form">
     <h4>Reset your password.</h4>

samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Send Verification Code";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="SendCode" asp-route-returnurl="@Model.ReturnUrl" method="post" class="form-horizontal" role="form">
     <input asp-for="RememberMe" type="hidden" />

samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Use recovery code";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="UseRecoveryCode" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal" role="form">
     <div asp-validation-summary="All" class="text-danger"></div>

samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Verify";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="VerifyAuthenticatorCode" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal" role="form">
     <div asp-validation-summary="All" class="text-danger"></div>

samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Verify";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="VerifyCode" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal" role="form">
     <div asp-validation-summary="All" class="text-danger"></div>

samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Add Phone Number";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <form asp-controller="Manage" asp-action="AddPhoneNumber" method="post" class="form-horizontal" role="form">
     <h4>Add a phone number.</h4>
     <hr />

samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Change Password";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Manage" asp-action="ChangePassword" method="post" class="form-horizontal" role="form">
     <h4>Change Password Form</h4>

samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Your recovery codes:";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">@ViewData["StatusMessage"]</p>
 
 <div>

samples/IdentitySample.Mvc/Views/Manage/Index.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Manage your account";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">@ViewData["StatusMessage"]</p>
 
 <div>

samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml

@@ -4,7 +4,7 @@
     ViewData["Title"] = "Manage your external logins";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <p class="text-success">@ViewData["StatusMessage"]</p>
 @if (Model.CurrentLogins.Count > 0)

samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Verify Phone Number";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Manage" asp-action="VerifyPhoneNumber" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal" role="form">
     <input asp-for="PhoneNumber" type="hidden" />

src/Core/IdentityServiceCollectionExtensions.cs

@@ -13,7 +13,8 @@ namespace Microsoft.Extensions.DependencyInjection
     public static class IdentityServiceCollectionExtensions
     {
         /// <summary>
-        /// Adds and configures the identity system for the specified User and Role types.
+        /// Adds and configures the identity system for the specified User type. Role services are not added 
+        /// by default but can be added with <see cref="IdentityBuilder.AddRoles{TRole}"/>.
         /// </summary>
         /// <typeparam name="TUser">The type representing a User in the system.</typeparam>
         /// <param name="services">The services available in the application.</param>
@@ -22,7 +23,8 @@ namespace Microsoft.Extensions.DependencyInjection
             => services.AddIdentityCore<TUser>(o => { });
 
         /// <summary>
-        /// Adds and configures the identity system for the specified User and Role types.
+        /// Adds and configures the identity system for the specified User type. Role services are not added by default 
+        /// but can be added with <see cref="IdentityBuilder.AddRoles{TRole}"/>.
         /// </summary>
         /// <typeparam name="TUser">The type representing a User in the system.</typeparam>
         /// <param name="services">The services available in the application.</param>
@@ -52,4 +54,4 @@ namespace Microsoft.Extensions.DependencyInjection
             return new IdentityBuilder(typeof(TUser), services);
         }
     }
-}
+}

src/UI/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml

@@ -4,7 +4,7 @@
     ViewData["Title"] = "Confirm email";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <div>
     <p>
         Thank you for confirming your email.

src/UI/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml

@@ -4,7 +4,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <h4 id="external-login-title">Associate your @Model.ProviderDisplayName account.</h4>
 <hr />
 

src/UI/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml

@@ -4,7 +4,7 @@
     ViewData["Title"] = "Forgot your password?";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <h4>Enter your email.</h4>
 <hr />
 <div class="row">

src/UI/Areas/Identity/Pages/V4/Account/ForgotPasswordConfirmation.cshtml

@@ -4,7 +4,7 @@
     ViewData["Title"] = "Forgot password confirmation";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <p>
     Please check your email to reset your password.
 </p>

src/UI/Areas/Identity/Pages/V4/Account/Login.cshtml

@@ -5,7 +5,7 @@
     ViewData["Title"] = "Log in";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <div class="row">
     <div class="col-md-4">
         <section>

src/UI/Areas/Identity/Pages/V4/Account/LoginWith2fa.cshtml

@@ -4,7 +4,7 @@
     ViewData["Title"] = "Two-factor authentication";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <hr />
 <p>Your login is protected with an authenticator app. Enter your authenticator code below.</p>
 <div class="row">

src/UI/Areas/Identity/Pages/V4/Account/LoginWithRecoveryCode.cshtml

@@ -4,7 +4,7 @@
     ViewData["Title"] = "Recovery code verification";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <hr />
 <p>
     You have requested to log in with a recovery code. This login will not be remembered until you provide

src/UI/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml

@@ -6,7 +6,7 @@
 }
 
 <partial name="_StatusMessage" for="StatusMessage" />
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 
 <div class="alert alert-warning" role="alert">
     <p>

src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml

@@ -4,7 +4,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 
 <div class="row">
     <div class="col-md-4">

src/UI/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml

@@ -4,7 +4,7 @@
     ViewData["Title"] = "Reset password";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <h4>Reset your password.</h4>
 <hr />
 <div class="row">

src/UI/Areas/Identity/Pages/V4/Account/ResetPasswordConfirmation.cshtml

@@ -4,7 +4,7 @@
     ViewData["Title"] = "Reset password confirmation";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <p>
     Your password has been reset. Please <a asp-page="./Login">click here to log in</a>.
 </p>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ConfirmEmail.cshtml

@@ -2,7 +2,7 @@
     ViewData["Title"] = "Confirm Email";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <div>
     <p>
         Thank you for confirming your email. Please <a asp-controller="Account" asp-action="Login">click here to log in</a>.

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ExternalLoginConfirmation.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <h3>Associate your @ViewData["LoginProvider"] account.</h3>
 
 <form asp-controller="Account" asp-action="ExternalLoginConfirmation" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ExternalLoginFailure.cshtml

@@ -3,6 +3,6 @@
 }
 
 <header>
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <p class="text-danger">Unsuccessful login with service.</p>
 </header>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml

@@ -2,7 +2,7 @@
     ViewData["Title"] = "Forgot Password Confirmation";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p>
     Please check your email to reset your password.
 </p>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Login.cshtml

@@ -10,7 +10,7 @@
     ViewData["Title"] = "Log in";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <div class="row">
     <div class="col-md-8">
         <section>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Register.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
     <h4>Create a new account.</h4>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ResetPassword.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Reset password";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="ResetPassword" method="post" class="form-horizontal">
     <h4>Reset your password.</h4>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/SendCode.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Send Verification Code";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="SendCode" asp-route-returnurl="@Model.ReturnUrl" method="post" class="form-horizontal">
     <input asp-for="RememberMe" type="hidden" />

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/VerifyCode.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Verify";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="VerifyCode" asp-route-returnurl="@Model.ReturnUrl" method="post" class="form-horizontal">
     <div asp-validation-summary="All" class="text-danger"></div>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddLogoutUri.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a logout uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <ul class="list-unstyled">
             <li class="h4">Name</li>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddRedirectUri.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a redirect uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <ul class="list-unstyled">
             <li class="h4">Name</li>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddScope.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a scope to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
     <ul class="list-unstyled">
         <li class="h4">Name</li>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Create.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Create your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <form asp-action="Create" method="post">

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateLogoutUri.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a logout uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateRedirectUri.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a redirect uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateScope.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a scope to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/EditScope.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Edit scope";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
     <ul class="list-unstyled">
         <li class="h4">Name</li>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/GenerateClientSecret.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Generate an application key";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
 
     <ul class="list-unstyled">

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/GeneratedClientSecret.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Application key successfully generated";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Index.cshtml

@@ -3,7 +3,7 @@
         ViewData["Title"] = "Manage your applications";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <p class="text-success">@ViewData["StatusMessage"]</p>
 
     <div>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RegenerateClientSecret.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Regenerate an application key";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
 
     <ul class="list-unstyled">

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveClientSecret.cshtml

@@ -5,7 +5,7 @@
         ViewData["Title"] = "Remove the application key";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
 
     <ul class="list-unstyled">

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/IdentityService/InvalidLogoutRedirect.cshtml

@@ -3,5 +3,5 @@
 @{
     ViewData["Title"] = "Invalid logout redirect";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-warning">@Model.ErrorDescription</p>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/IdentityService/SignedOut.cshtml

@@ -1,5 +1,5 @@
 @{
     ViewData["Title"] = "Signed Out";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">You have successfully signed out.</p>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/AddPhoneNumber.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Add Phone Number";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <form asp-controller="Manage" asp-action="AddPhoneNumber" method="post" class="form-horizontal">
     <h4>Add a phone number.</h4>
     <hr />

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/ChangePassword.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Change Password";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Manage" asp-action="ChangePassword" method="post" class="form-horizontal">
     <h4>Change Password</h4>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/Index.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Manage your account";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">@ViewData["StatusMessage"]</p>
 
 <div>

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/ManageLogins.cshtml

@@ -4,7 +4,7 @@
     ViewData["Title"] = "Manage your external logins";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <p class="text-success">@ViewData["StatusMessage"]</p>
 @if (Model.CurrentLogins.Count > 0)

test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/VerifyPhoneNumber.cshtml

@@ -3,7 +3,7 @@
     ViewData["Title"] = "Verify Phone Number";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Manage" asp-action="VerifyPhoneNumber" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
     <input asp-for="PhoneNumber" type="hidden" />

test/WebSites/Identity.OpenIdConnect.WebSite/Identity.OpenIdConnect.WebSite.csproj

@@ -40,6 +40,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

test/WebSites/Identity.OpenIdConnect.WebSite/Views/Account/SignedOut.cshtml

@@ -1,5 +1,5 @@
 @{
     ViewData["Title"] = "Signed Out";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">You have successfully signed out.</p>

test/WebSites/Identity.OpenIdConnect.WebSite/Views/Home/About.cshtml

@@ -1,7 +1,7 @@
 @{
     ViewData["Title"] = "About";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <h3>@ViewData["Message"]</h3>
 
 <p>Use this area to provide additional information.</p>

test/WebSites/Identity.OpenIdConnect.WebSite/Views/Home/Contact.cshtml

@@ -1,7 +1,7 @@
 @{
     ViewData["Title"] = "Contact";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <h3>@ViewData["Message"]</h3>
 
 <address>

version.props

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <VersionPrefix>3.0.0</VersionPrefix>
     <VersionSuffix>alpha1</VersionSuffix>