From 647d6ac5ab2b90fd2b6aecf680cb005247badf5a Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 25 Jan 2021 07:37:05 +0100
Subject: [PATCH] Post merge fix (conflicts)

---
 .../DisableModelsBuilderNotificationHandler.cs         |  5 +----
 .../LiveModelsProvider.cs                              |  5 +----
 .../ModelsBuilderNotificationHandler.cs                | 10 ++--------
 .../OutOfDateModelsStatus.cs                           |  5 +----
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.ModelsBuilder.Embedded/DisableModelsBuilderNotificationHandler.cs b/src/Umbraco.ModelsBuilder.Embedded/DisableModelsBuilderNotificationHandler.cs
index 8f7e118b6a..b455bbbf61 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/DisableModelsBuilderNotificationHandler.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/DisableModelsBuilderNotificationHandler.cs
@@ -1,5 +1,3 @@
-using System.Threading;
-using System.Threading.Tasks;
 using Umbraco.Core.Events;
 using Umbraco.ModelsBuilder.Embedded.BackOffice;
 using Umbraco.ModelsBuilder.Embedded.DependencyInjection;
@@ -19,11 +17,10 @@ namespace Umbraco.ModelsBuilder.Embedded
         /// <summary>
         /// Handles the <see cref="UmbracoApplicationStarting"/> notification to disable MB controller features
         /// </summary>
-        public Task HandleAsync(UmbracoApplicationStarting notification, CancellationToken cancellationToken)
+        public void Handle(UmbracoApplicationStarting notification)
         {
             // disable the embedded dashboard controller
             _features.Disabled.Controllers.Add<ModelsBuilderDashboardController>();
-            return Task.CompletedTask;
         }
     }
 }
diff --git a/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
index 11c5d8b605..8b7b639dff 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -8,7 +7,6 @@ using Umbraco.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Configuration.Models;
 using Umbraco.Core.Events;
-using Umbraco.Core.Hosting;
 using Umbraco.Extensions;
 using Umbraco.ModelsBuilder.Embedded.Building;
 using Umbraco.Web.Cache;
@@ -52,10 +50,9 @@ namespace Umbraco.ModelsBuilder.Embedded
         /// <summary>
         /// Handles the <see cref="UmbracoApplicationStarting"/> notification
         /// </summary>
-        public Task HandleAsync(UmbracoApplicationStarting notification, CancellationToken cancellationToken)
+        public void Handle(UmbracoApplicationStarting notification)
         {
             Install();
-            return Task.CompletedTask;
         }
 
         private void Install()
diff --git a/src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs b/src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs
index 37ff1c735a..9e11a9808d 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Options;
 using Umbraco.Core.Configuration;
@@ -47,7 +45,7 @@ namespace Umbraco.ModelsBuilder.Embedded
         /// <summary>
         /// Handles the <see cref="UmbracoApplicationStarting"/> notification
         /// </summary>
-        public Task HandleAsync(UmbracoApplicationStarting notification, CancellationToken cancellationToken)
+        public void Handle(UmbracoApplicationStarting notification)
         {
             // always setup the dashboard
             // note: UmbracoApiController instances are automatically registered
@@ -57,14 +55,12 @@ namespace Umbraco.ModelsBuilder.Embedded
             {
                 FileService.SavingTemplate += FileService_SavingTemplate;
             }
-
-            return Task.CompletedTask;
         }
 
         /// <summary>
         /// Handles the <see cref="ServerVariablesParsing"/> notification
         /// </summary>
-        public Task HandleAsync(ServerVariablesParsing notification, CancellationToken cancellationToken)
+        public void Handle(ServerVariablesParsing notification)
         {
             IDictionary<string, object> serverVars = notification.ServerVariables;
 
@@ -96,8 +92,6 @@ namespace Umbraco.ModelsBuilder.Embedded
 
             umbracoUrls["modelsBuilderBaseUrl"] = _linkGenerator.GetUmbracoApiServiceBaseUrl<ModelsBuilderDashboardController>(controller => controller.BuildModels());
             umbracoPlugins["modelsBuilder"] = GetModelsBuilderSettings();
-
-            return Task.CompletedTask;
         }
 
         private Dictionary<string, object> GetModelsBuilderSettings()
diff --git a/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs b/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
index 0a8283b507..ad757cbf7e 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
@@ -1,6 +1,4 @@
 using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.Models;
@@ -40,10 +38,9 @@ namespace Umbraco.ModelsBuilder.Embedded
         /// <summary>
         /// Handles the <see cref="UmbracoApplicationStarting"/> notification
         /// </summary>
-        public Task HandleAsync(UmbracoApplicationStarting notification, CancellationToken cancellationToken)
+        public void Handle(UmbracoApplicationStarting notification)
         {
             Install();
-            return Task.CompletedTask;
         }
 
         private void Install()