Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore

# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Startup.cs

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

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
-
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Web.UI.BackOffice
 {
@@ -15,6 +15,7 @@ namespace Umbraco.Web.UI.BackOffice
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
+                .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); })
+                .UseUmbraco();
     }
 }

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

@@ -25,8 +25,8 @@ namespace Umbraco.Web.UI.BackOffice
 
             services.AddUmbracoConfiguration();
             services.AddUmbracoRequest();
+            services.AddUmbracoCore();
             services.AddUmbracoWebsite();
-            services.AddUmbracoBackOffice();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.