huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.2'

This commit is contained in:
Javier Calvarro Nelson 2018-10-26 10:55:39 -07:00
parent 08074b6714 95bc251848
commit 2ab58c47f7
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/UI/Areas/Identity/Pages/V3/Account/Register.cshtml.cs
View File

@ -90,14 +90,14 @@ namespace Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal
private readonly UserManager<TUser> _userManager; private readonly UserManager<TUser> _userManager;
private readonly IUserStore<TUser> _userStore; private readonly IUserStore<TUser> _userStore;
private readonly IUserEmailStore<TUser> _emailStore; private readonly IUserEmailStore<TUser> _emailStore;
private readonly ILogger<LoginModel> _logger; private readonly ILogger<RegisterModel> _logger;
private readonly IEmailSender _emailSender; private readonly IEmailSender _emailSender;
public RegisterModel( public RegisterModel(
UserManager<TUser> userManager, UserManager<TUser> userManager,
IUserStore<TUser> userStore, IUserStore<TUser> userStore,
SignInManager<TUser> signInManager, SignInManager<TUser> signInManager,
ILogger<LoginModel> logger, ILogger<RegisterModel> logger,
IEmailSender emailSender) IEmailSender emailSender)
{ {
_userManager = userManager; _userManager = userManager;

4
src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml.cs
View File

@ -89,14 +89,14 @@ namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal
private readonly UserManager<TUser> _userManager; private readonly UserManager<TUser> _userManager;
private readonly IUserStore<TUser> _userStore; private readonly IUserStore<TUser> _userStore;
private readonly IUserEmailStore<TUser> _emailStore; private readonly IUserEmailStore<TUser> _emailStore;
private readonly ILogger<LoginModel> _logger; private readonly ILogger<RegisterModel> _logger;
private readonly IEmailSender _emailSender; private readonly IEmailSender _emailSender;
public RegisterModel( public RegisterModel(
UserManager<TUser> userManager, UserManager<TUser> userManager,
IUserStore<TUser> userStore, IUserStore<TUser> userStore,
SignInManager<TUser> signInManager, SignInManager<TUser> signInManager,
ILogger<LoginModel> logger, ILogger<RegisterModel> logger,
IEmailSender emailSender) IEmailSender emailSender)
{ {
_userManager = userManager; _userManager = userManager;

10
test/WebSites/Identity.DefaultUI.WebSite/StartupBase.cs
View File

@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Identity.UI;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.FileProviders;
namespace Identity.DefaultUI.WebSite namespace Identity.DefaultUI.WebSite
{ {
@ -44,7 +45,14 @@ namespace Identity.DefaultUI.WebSite
.AddRoles<IdentityRole>() .AddRoles<IdentityRole>()
.AddEntityFrameworkStores<TContext>(); .AddEntityFrameworkStores<TContext>();
services.AddMvc(); services.AddMvc()
.AddRazorOptions(ro =>
{
// We do this to avoid file descriptor exhaustion in our functional tests
// due to Razor Pages using a file watcher.
ro.FileProviders.Clear();
ro.FileProviders.Add(new CompositeFileProvider(new[] { new NullFileProvider() }));
});
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.