From 34427b010434e73c56a9cb5fb21060f1f6e8cc24 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 4 Jan 2021 13:22:29 +1100
Subject: [PATCH] Moves AddDistributed cache back to being called implicitly,
 ensures notification handlers are not added twice

---
 .../DependencyInjection/UmbracoBuilder.Events.cs     | 12 +++++++++---
 .../Umbraco.Core/Events/EventAggregatorTests.cs      |  1 +
 .../DependencyInjection/UmbracoBuilderExtensions.cs  |  3 ++-
 src/Umbraco.Web.UI.NetCore/Startup.cs                |  2 --
 .../DependencyInjection/UmbracoBuilderExtensions.cs  |  2 ++
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Events.cs b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Events.cs
index 138fa9bf9c..c24936b4fb 100644
--- a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Events.cs
+++ b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Events.cs
@@ -24,9 +24,15 @@ namespace Umbraco.Core.DependencyInjection
             where TNotification : INotification
         {
             // Register the handler as transient. This ensures that anything can be injected into it.
-            // TODO: Waiting on feedback here for TryAddTransient https://github.com/umbraco/Umbraco-CMS/pull/9556/files#r548365396
-            // ... though this will fail tests so it's not the final answer so we'll see where that discussion goes.
-            builder.Services.AddTransient(typeof(INotificationHandler<TNotification>), typeof(TNotificationHandler));
+            var descriptor = new ServiceDescriptor(typeof(INotificationHandler<TNotification>), typeof(TNotificationHandler), ServiceLifetime.Transient);
+
+            // TODO: Waiting on feedback here https://github.com/umbraco/Umbraco-CMS/pull/9556/files#r548365396 about whether
+            // we perform this duplicate check or not.
+            if (!builder.Services.Contains(descriptor))
+            {
+                builder.Services.Add(descriptor);
+            }
+
             return builder;
         }
     }
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs
index 08d78af59e..cbf3d02542 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs
@@ -13,6 +13,7 @@ using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.UnitTests.Umbraco.Core.Events
 {
+    [TestFixture]
     public class EventAggregatorTests
     {
         private const int A = 3;
diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
index 6bb75e774a..0d12fae687 100644
--- a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -43,7 +43,8 @@ namespace Umbraco.Web.BackOffice.DependencyInjection
                 .AddMvcAndRazor()
                 .AddWebServer()
                 .AddPreviewSupport()
-                .AddHostedServices();
+                .AddHostedServices()
+                .AddDistributedCache();
 
         /// <summary>
         /// Adds Umbraco back office authentication requirements
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index 5b262098e6..46f7b2d7ae 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -6,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Umbraco.Core.DependencyInjection;
 using Umbraco.Extensions;
-using Umbraco.Infrastructure.DependencyInjection;
 using Umbraco.Web.BackOffice.DependencyInjection;
 using Umbraco.Web.BackOffice.Security;
 using Umbraco.Web.Common.DependencyInjection;
@@ -48,7 +47,6 @@ namespace Umbraco.Web.UI.NetCore
             services.AddUmbraco(_env, _config)
                 .AddBackOffice()
                 .AddWebsite()
-                .AddDistributedCache()
                 .AddComposers()
                 .Build();
 #pragma warning restore IDE0022 // Use expression body for methods
diff --git a/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
index 41292b9415..52f6d5df11 100644
--- a/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -43,6 +43,8 @@ namespace Umbraco.Web.Website.DependencyInjection
             builder.Services.AddScoped<UmbracoRouteValueTransformer>();
             builder.Services.AddSingleton<IUmbracoRenderingDefaults, UmbracoRenderingDefaults>();
 
+            builder.AddDistributedCache();
+
             return builder;
         }