From 9a8ecea8a679afb95c90c07706c9881c6d894c2e Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 25 Feb 2020 08:56:58 +0100 Subject: [PATCH] Updated copyright year --- src/SolutionInfo.cs | 2 +- .../UmbracoBackOfficeServiceCollectionExtensions.cs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index a9f5dcf352..4c2d72fb8c 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -2,7 +2,7 @@ using System.Resources; [assembly: AssemblyCompany("Umbraco")] -[assembly: AssemblyCopyright("Copyright © Umbraco 2019")] +[assembly: AssemblyCopyright("Copyright © Umbraco 2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs index 8c7a798e95..18ec4d6b03 100644 --- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs +++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs @@ -1,12 +1,15 @@ +using System.Configuration; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; +using Umbraco.Composing; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Configuration; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Logging.Serilog; +using Umbraco.Core.Runtime; namespace Umbraco.Web.BackOffice.AspNetCore { @@ -20,10 +23,10 @@ namespace Umbraco.Web.BackOffice.AspNetCore CreateCompositionRoot(services); - return services; } + private static void CreateCompositionRoot(IServiceCollection services) { var serviceProvider = services.BuildServiceProvider(); @@ -44,7 +47,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore var backOfficeInfo = new AspNetCoreBackOfficeInfo(configs.Global()); var profiler = new LogProfiler(logger); - Composing.Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler); + Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler); } } }