From a5b331f6d7c4a1760ba7b99d04d80f5cf49115e2 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 3 Dec 2018 16:40:28 +1100 Subject: [PATCH] Gets site running with dashboards --- .../CompositionRoots/ConfigurationCompositionRoot.cs | 1 + src/Umbraco.Web/Runtime/WebRuntimeComponent.cs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/Composing/CompositionRoots/ConfigurationCompositionRoot.cs b/src/Umbraco.Core/Composing/CompositionRoots/ConfigurationCompositionRoot.cs index 82912163b6..80de6d1c35 100644 --- a/src/Umbraco.Core/Composing/CompositionRoots/ConfigurationCompositionRoot.cs +++ b/src/Umbraco.Core/Composing/CompositionRoots/ConfigurationCompositionRoot.cs @@ -16,6 +16,7 @@ namespace Umbraco.Core.Composing.CompositionRoots container.Register(factory => factory.GetInstance().Templates); container.Register(factory => factory.GetInstance().RequestHandler); container.Register(factory => UmbracoConfig.For.GlobalSettings()); + container.Register(factory => UmbracoConfig.For.DashboardSettings()); // fixme - other sections we need to add? } diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs index 6ed9599af4..f8963f2f01 100644 --- a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs +++ b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs @@ -122,6 +122,8 @@ namespace Umbraco.Web.Runtime composition.Container.EnableMvc(); // does container.EnablePerWebRequestScope() composition.Container.ScopeManagerProvider = smp; // reverts - we will do it last (in WebRuntime) + composition.Container.RegisterSingleton(); + composition.Container.RegisterUmbracoControllers(typeLoader, GetType().Assembly); composition.Container.EnableWebApi(GlobalConfiguration.Configuration); @@ -208,8 +210,6 @@ namespace Umbraco.Web.Runtime .Append() .Append() .Append(); - - composition.Container.RegisterSingleton(); } internal void Initialize(