From 6114fffb4a97d6a71bc5b57cfb877d18458ac679 Mon Sep 17 00:00:00 2001
From: Paul Johnson <paul@rustybox.co.uk>
Date: Fri, 18 Dec 2020 09:53:01 +0000
Subject: [PATCH] Remove HostBuilder UseUmbraco extension, it's not required.

---
 .../Composing/HostBuilderExtensions.cs        | 25 -------------------
 src/Umbraco.Tests.Integration/RuntimeTests.cs |  1 -
 .../Testing/UmbracoIntegrationTest.cs         |  1 -
 .../Builder/UmbracoBuilderExtensions.cs       |  2 ++
 src/Umbraco.Web.UI.NetCore/Program.cs         |  1 -
 5 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 src/Umbraco.Infrastructure/Composing/HostBuilderExtensions.cs

diff --git a/src/Umbraco.Infrastructure/Composing/HostBuilderExtensions.cs b/src/Umbraco.Infrastructure/Composing/HostBuilderExtensions.cs
deleted file mode 100644
index 8e1176747c..0000000000
--- a/src/Umbraco.Infrastructure/Composing/HostBuilderExtensions.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Extends the <see cref="IHostBuilder"/> to add CoreRuntime as a HostedService
-    /// </summary>
-    public static class HostBuilderExtensions
-    {
-        /// <summary>
-        /// Adds CoreRuntime as HostedService
-        /// </summary>
-        /// <remarks>
-        /// Should be called before ConfigureWebDefaults.
-        /// </remarks>
-        public static IHostBuilder UseUmbraco(this IHostBuilder builder)
-        {
-            _ = builder.ConfigureServices((context, services) =>
-                  services.AddSingleton<IHostedService>(factory => factory.GetRequiredService<IRuntime>()));
-
-            return builder;
-        }
-    }
-}
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index cd6909a8c5..f74a95af4c 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -43,7 +43,6 @@ namespace Umbraco.Tests.Integration
             var testHelper = new TestHelper();
 
             var hostBuilder = new HostBuilder()
-                .UseUmbraco()
                 .ConfigureServices((hostContext, services) =>
                 {
                     var webHostEnvironment = testHelper.GetWebHostEnvironment();
diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
index e62b3f5c7f..d3abd76d7b 100644
--- a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
+++ b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
@@ -153,7 +153,6 @@ namespace Umbraco.Tests.Integration.Testing
         public virtual IHostBuilder CreateHostBuilder()
         {
             var hostBuilder = Host.CreateDefaultBuilder()
-                .UseUmbraco()
                 // IMPORTANT: We Cannot use UseStartup, there's all sorts of threads about this with testing. Although this can work
                 // if you want to setup your tests this way, it is a bit annoying to do that as the WebApplicationFactory will
                 // create separate Host instances. So instead of UseStartup, we just call ConfigureServices/Configure ourselves,
diff --git a/src/Umbraco.Web.Common/Builder/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.Common/Builder/UmbracoBuilderExtensions.cs
index b8dccfbe33..445025a80c 100644
--- a/src/Umbraco.Web.Common/Builder/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Web.Common/Builder/UmbracoBuilderExtensions.cs
@@ -146,7 +146,9 @@ namespace Umbraco.Core.DependencyInjection
             builder.Services.AddUnique<IRuntimeState, RuntimeState>();
             builder.Services.AddUnique<IHostingEnvironment, AspNetCoreHostingEnvironment>();
             builder.Services.AddUnique<IMainDom, MainDom>();
+
             builder.Services.AddUnique<IRuntime, CoreRuntime>();
+            builder.Services.AddHostedService<IRuntime>(factory => factory.GetRequiredService<IRuntime>());
 
             builder.AddCoreInitialServices();
             builder.AddComposers();
diff --git a/src/Umbraco.Web.UI.NetCore/Program.cs b/src/Umbraco.Web.UI.NetCore/Program.cs
index 95322cb1b0..4849ee226a 100644
--- a/src/Umbraco.Web.UI.NetCore/Program.cs
+++ b/src/Umbraco.Web.UI.NetCore/Program.cs
@@ -20,7 +20,6 @@ namespace Umbraco.Web.UI.NetCore
                 {
                     x.ClearProviders();
                 })
-                .UseUmbraco()
                 .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
     }
 }