From e2186cafb179f36078576cd4e02caef6377d5c1c Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 31 Aug 2020 12:58:04 -0700 Subject: [PATCH 1/3] Fix Unhandled DBErrors in ComponentsWebAssembly and Spa templates --- .../content/ComponentsWebAssembly-CSharp/Server/Startup.cs | 2 +- .../Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs | 2 +- .../Web.Spa.ProjectTemplates/content/React-CSharp/Startup.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Startup.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Startup.cs index 3ebd062721ba..52df8d06aa59 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Startup.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Startup.cs @@ -49,9 +49,9 @@ public void ConfigureServices(IServiceCollection services) #else options.UseSqlite( Configuration.GetConnectionString("DefaultConnection"))); +#endif services.AddDatabaseDeveloperPageExceptionFilter(); -#endif services.AddDefaultIdentity(options => options.SignIn.RequireConfirmedAccount = true) .AddEntityFrameworkStores(); diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs index ba2727166774..73e8a87af1db 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs @@ -42,9 +42,9 @@ public void ConfigureServices(IServiceCollection services) #else options.UseSqlite( Configuration.GetConnectionString("DefaultConnection"))); +#endif services.AddDatabaseDeveloperPageExceptionFilter(); -#endif services.AddDefaultIdentity(options => options.SignIn.RequireConfirmedAccount = true) .AddEntityFrameworkStores(); diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Startup.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Startup.cs index 1c58bdd186bd..378ce7bcee4e 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Startup.cs +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Startup.cs @@ -42,9 +42,9 @@ public void ConfigureServices(IServiceCollection services) #else options.UseSqlite( Configuration.GetConnectionString("DefaultConnection"))); +#endif services.AddDatabaseDeveloperPageExceptionFilter(); -#endif services.AddDefaultIdentity(options => options.SignIn.RequireConfirmedAccount = true) .AddEntityFrameworkStores(); From d6c228e1c801e6ba53da63d8aa10b64834b0f746 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 31 Aug 2020 17:05:43 -0700 Subject: [PATCH 2/3] Add workaround for EF issue --- .../src/DatabaseDeveloperPageExceptionFilter.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseDeveloperPageExceptionFilter.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseDeveloperPageExceptionFilter.cs index 3ba74bc18fe9..0c1df8e3374f 100644 --- a/src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseDeveloperPageExceptionFilter.cs +++ b/src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseDeveloperPageExceptionFilter.cs @@ -38,7 +38,8 @@ public async Task HandleExceptionAsync(ErrorContext errorContext, Func() - .Select(o => o.ContextType); + .Select(o => o.ContextType) + .Distinct(); if (registeredContexts.Any()) { From 94a570d9e5d8a65869c4a7e22030724242b488f6 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 31 Aug 2020 18:17:51 -0700 Subject: [PATCH 3/3] Update src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseDeveloperPageExceptionFilter.cs Co-authored-by: Pranav K --- .../src/DatabaseDeveloperPageExceptionFilter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseDeveloperPageExceptionFilter.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseDeveloperPageExceptionFilter.cs index 0c1df8e3374f..447124077e0d 100644 --- a/src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseDeveloperPageExceptionFilter.cs +++ b/src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseDeveloperPageExceptionFilter.cs @@ -39,7 +39,7 @@ public async Task HandleExceptionAsync(ErrorContext errorContext, Func() .Select(o => o.ContextType) - .Distinct(); + .Distinct(); // Workaround for https://github.com/dotnet/efcore/issues/22341 if (registeredContexts.Any()) {