Bjarke Berg
e46a248832
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller-merge
# Conflicts:
# src/Umbraco.Infrastructure/HostedServices/ScheduledPublishing.cs
# src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
# src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
# src/Umbraco.Infrastructure/Scheduling/SchedulerComposer.cs
# src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
# src/Umbraco.Tests/Testing/UmbracoTestBase.cs
# src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs
# src/Umbraco.Web.BackOffice/Runtime/BackOfficeComposer.cs
# src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
# src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs
# src/Umbraco.Web.UI.NetCore/appsettings.json
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Runtime/WebInitialComponent.cs