From 168be7b561f1f069144554bb774673cc6f30f726 Mon Sep 17 00:00:00 2001
From: Wouter Huysentruit <wouter_huysentruit@hotmail.com>
Date: Fri, 21 Sep 2018 18:01:44 +0200
Subject: [PATCH 1/2] Use the correct logging category inside RegisterModel

---
 src/UI/Areas/Identity/Pages/V3/Account/Register.cshtml.cs | 4 ++--
 src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/UI/Areas/Identity/Pages/V3/Account/Register.cshtml.cs b/src/UI/Areas/Identity/Pages/V3/Account/Register.cshtml.cs
index 4fa4f074b3..af35c3e120 100644
--- a/src/UI/Areas/Identity/Pages/V3/Account/Register.cshtml.cs
+++ b/src/UI/Areas/Identity/Pages/V3/Account/Register.cshtml.cs
@@ -90,14 +90,14 @@ namespace Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal
         private readonly UserManager<TUser> _userManager;
         private readonly IUserStore<TUser> _userStore;
         private readonly IUserEmailStore<TUser> _emailStore;
-        private readonly ILogger<LoginModel> _logger;
+        private readonly ILogger<RegisterModel> _logger;
         private readonly IEmailSender _emailSender;
 
         public RegisterModel(
             UserManager<TUser> userManager,
             IUserStore<TUser> userStore,
             SignInManager<TUser> signInManager,
-            ILogger<LoginModel> logger,
+            ILogger<RegisterModel> logger,
             IEmailSender emailSender)
         {
             _userManager = userManager;
diff --git a/src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml.cs b/src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml.cs
index a795faa060..de8322f63f 100644
--- a/src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml.cs
+++ b/src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml.cs
@@ -89,14 +89,14 @@ namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal
         private readonly UserManager<TUser> _userManager;
         private readonly IUserStore<TUser> _userStore;
         private readonly IUserEmailStore<TUser> _emailStore;
-        private readonly ILogger<LoginModel> _logger;
+        private readonly ILogger<RegisterModel> _logger;
         private readonly IEmailSender _emailSender;
 
         public RegisterModel(
             UserManager<TUser> userManager,
             IUserStore<TUser> userStore,
             SignInManager<TUser> signInManager,
-            ILogger<LoginModel> logger,
+            ILogger<RegisterModel> logger,
             IEmailSender emailSender)
         {
             _userManager = userManager;

From 95bc2518486554be18191211e70a2ac8e8765ed3 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Fri, 26 Oct 2018 10:40:08 -0700
Subject: [PATCH 2/2] Avoid file descriptor exhaustion caused by Razor Pages on
 functional tests

---
 .../WebSites/Identity.DefaultUI.WebSite/StartupBase.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/WebSites/Identity.DefaultUI.WebSite/StartupBase.cs b/test/WebSites/Identity.DefaultUI.WebSite/StartupBase.cs
index 5e69c1bea4..35a94b3b72 100644
--- a/test/WebSites/Identity.DefaultUI.WebSite/StartupBase.cs
+++ b/test/WebSites/Identity.DefaultUI.WebSite/StartupBase.cs
@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Identity.UI;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
 
 namespace Identity.DefaultUI.WebSite
 {
@@ -44,7 +45,14 @@ namespace Identity.DefaultUI.WebSite
                 .AddRoles<IdentityRole>()
                 .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.