From a96bcc05f5d762bb43d23e39f8936c45611d5d6a Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Mon, 16 Mar 2020 19:14:04 +0100 Subject: [PATCH] Use the new ConfigsFactory --- ...racoBackOfficeServiceCollectionExtensions.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs index 9010979507..f54e8501db 100644 --- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs +++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Umbraco.Composing; using Umbraco.Configuration; +using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.HealthChecks; @@ -28,11 +29,6 @@ namespace Umbraco.Web.BackOffice.AspNetCore var configuration = serviceProvider.GetService(); var configsFactory = new AspNetCoreConfigsFactory(configuration); - var configs = configsFactory.Create(); - - var settings = configs.GetConfig(); - - services.CreateCompositionRoot( httpContextAccessor, @@ -51,15 +47,16 @@ namespace Umbraco.Web.BackOffice.AspNetCore IHostApplicationLifetime hostApplicationLifetime, IConfigsFactory configsFactory) { - var configFactory = new ConfigsFactory(); - var hostingSettings = configFactory.HostingSettings; - var coreDebug = configFactory.CoreDebugSettings; - var globalSettings = configFactory.GlobalSettings; + var configs = configsFactory.Create(); + + var hostingSettings = configs.Hosting(); + var coreDebug = configs.CoreDebug(); + var globalSettings = configs.Global(); var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime); var ioHelper = new IOHelper(hostingEnvironment, globalSettings); var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment, new AspNetCoreSessionIdResolver(httpContextAccessor), () => services.BuildServiceProvider().GetService(), coreDebug, ioHelper, new AspNetCoreMarchal()); - var configs = configFactory.Create(); + var backOfficeInfo = new AspNetCoreBackOfficeInfo(globalSettings); var profiler = new LogProfiler(logger);