AB#5820 - Cleanup

src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs

@@ -18,7 +18,7 @@ namespace Umbraco.Net
     }
 
 
-    public interface IUmbracoApplicationLifetimeManager: IUmbracoApplicationLifetime
+    public interface IUmbracoApplicationLifetimeManager
     {
         void InvokeApplicationInit();
     }

src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs

@@ -6,7 +6,7 @@ using Umbraco.Net;
 
 namespace Umbraco.Web.Common.AspNetCore
 {
-    public class AspNetCoreUmbracoApplicationLifetime :  IUmbracoApplicationLifetimeManager
+    public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime, IUmbracoApplicationLifetimeManager
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IHostApplicationLifetime _hostApplicationLifetime;

src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetimeManager.cs

@@ -2,7 +2,7 @@
 
 namespace Umbraco.Web.Common.Lifetime
 {
-    public interface IUmbracoRequestLifetimeManager : IUmbracoRequestLifetime
+    public interface IUmbracoRequestLifetimeManager
     {
         void InitRequest(HttpContext context);
         void EndRequest(HttpContext context);

src/Umbraco.Web.Common/Lifetime/UmbracoRequestLifetime.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http;
 
 namespace Umbraco.Web.Common.Lifetime
 {
-    public class UmbracoRequestLifetime : IUmbracoRequestLifetimeManager
+    public class UmbracoRequestLifetime : IUmbracoRequestLifetime, IUmbracoRequestLifetimeManager
     {
         public event EventHandler<HttpContext> RequestStart;
         public event EventHandler<HttpContext> RequestEnd;

src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs

@@ -34,7 +34,6 @@ namespace Umbraco.Web.Common.Runtime
             composition.RegisterUnique<UmbracoRequestLifetime>();
             composition.RegisterUnique<IUmbracoRequestLifetimeManager>(factory => factory.GetInstance<UmbracoRequestLifetime>());
             composition.RegisterUnique<IUmbracoRequestLifetime>(factory => factory.GetInstance<UmbracoRequestLifetime>());
-            composition.RegisterUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
         }
     }
 }

src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs

@@ -11,11 +11,11 @@ namespace Umbraco.Web.Common.Runtime.Profiler
     {
         private readonly bool _profile;
         private readonly WebProfiler _profiler;
-        private readonly IUmbracoApplicationLifetimeManager _umbracoApplicationLifetime;
+        private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
         private readonly IUmbracoRequestLifetime _umbracoRequestLifetime;
 
         public WebProfilerComponent(IProfiler profiler, ILogger logger, IUmbracoRequestLifetime umbracoRequestLifetime,
-            IUmbracoApplicationLifetimeManager umbracoApplicationLifetime)
+            IUmbracoApplicationLifetime umbracoApplicationLifetime)
         {
             _umbracoRequestLifetime = umbracoRequestLifetime;
             _umbracoApplicationLifetime = umbracoApplicationLifetime;

src/Umbraco.Web/Logging/WebProfilerComposer.cs

@@ -1,4 +1,4 @@
-using Umbraco.Core.Composing;
+ using Umbraco.Core.Composing;
 
 namespace Umbraco.Web.Logging
 {