Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
#	src/Umbraco.Web/Editors/AuthenticationController.cs

src/Umbraco.Web.UI.NetCore/Program.cs

@@ -21,6 +21,10 @@ namespace Umbraco.Web.UI.NetCore
                     x.ClearProviders();
                 })
                 .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); })
+                // TODO: MSDI - this should probably be on one day, more so when we can reduce the number
+                // of times we build a ServiceProvider from services collection
+                // right now it's just painful.
+                .UseDefaultServiceProvider(options => options.ValidateOnBuild = false)
                 .UseUmbraco();
     }
 }

src/Umbraco.Web.UI.NetCore/Startup.cs

@@ -33,7 +33,10 @@ namespace Umbraco.Web.UI.NetCore
         public void ConfigureServices(IServiceCollection services)
         {
             var umbracoBuilder = services.AddUmbraco(_env, _config);
-            umbracoBuilder.BuildWithAllBackOfficeComponents();
+            umbracoBuilder
+                .WithAllBackOfficeComponents()
+                .WithAllWebsiteComponents()
+                .Build();
 
         }