From e4ed87fb9a182191134eac48001cd7ce26551da7 Mon Sep 17 00:00:00 2001
From: Paul Johnson <pmj@umbraco.com>
Date: Fri, 6 May 2022 10:35:45 +0100
Subject: [PATCH] Ensure correct instance returned from
 UmbracoHostBuilderDecorator

---
 .../Hosting/UmbracoHostBuilderDecorator.cs    | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.Common/Hosting/UmbracoHostBuilderDecorator.cs b/src/Umbraco.Web.Common/Hosting/UmbracoHostBuilderDecorator.cs
index 72fedae468..c460cf8f03 100644
--- a/src/Umbraco.Web.Common/Hosting/UmbracoHostBuilderDecorator.cs
+++ b/src/Umbraco.Web.Common/Hosting/UmbracoHostBuilderDecorator.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -17,25 +15,43 @@ internal class UmbracoHostBuilderDecorator : IHostBuilder
         _onBuild = onBuild;
     }
 
-    public IHostBuilder ConfigureAppConfiguration(Action<HostBuilderContext, IConfigurationBuilder> configureDelegate) =>
+    public IHostBuilder ConfigureAppConfiguration(Action<HostBuilderContext, IConfigurationBuilder> configureDelegate)
+    {
         _inner.ConfigureAppConfiguration(configureDelegate);
+        return this;
+    }
 
-    public IHostBuilder ConfigureContainer<TContainerBuilder>(Action<HostBuilderContext, TContainerBuilder> configureDelegate) =>
+    public IHostBuilder ConfigureContainer<TContainerBuilder>(Action<HostBuilderContext, TContainerBuilder> configureDelegate)
+    {
         _inner.ConfigureContainer(configureDelegate);
+        return this;
+    }
 
-    public IHostBuilder ConfigureHostConfiguration(Action<IConfigurationBuilder> configureDelegate) =>
+    public IHostBuilder ConfigureHostConfiguration(Action<IConfigurationBuilder> configureDelegate)
+    {
         _inner.ConfigureHostConfiguration(configureDelegate);
+        return this;
+    }
 
-    public IHostBuilder ConfigureServices(Action<HostBuilderContext, IServiceCollection> configureDelegate) =>
+    public IHostBuilder ConfigureServices(Action<HostBuilderContext, IServiceCollection> configureDelegate)
+    {
         _inner.ConfigureServices(configureDelegate);
+        return this;
+    }
 
     public IHostBuilder UseServiceProviderFactory<TContainerBuilder>(IServiceProviderFactory<TContainerBuilder> factory)
-        where TContainerBuilder : notnull =>
+        where TContainerBuilder : notnull
+    {
         _inner.UseServiceProviderFactory(factory);
+        return this;
+    }
 
     public IHostBuilder UseServiceProviderFactory<TContainerBuilder>(Func<HostBuilderContext, IServiceProviderFactory<TContainerBuilder>> factory)
-        where TContainerBuilder : notnull =>
+        where TContainerBuilder : notnull
+    {
         _inner.UseServiceProviderFactory(factory);
+        return this;
+    }
 
     public IDictionary<object, object> Properties => _inner.Properties;