Move Web.Current to Composing

src/Umbraco.Web/Cache/CacheRefresherComponent.cs

@@ -16,6 +16,7 @@ using Umbraco.Core.Components;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Services.Changes;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Security;
 using Umbraco.Web.Services;
 using Content = Umbraco.Core.Models.Content;

src/Umbraco.Web/Cache/ContentCacheRefresher.cs

@@ -6,6 +6,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Services.Changes;
+using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Web.Cache

src/Umbraco.Web/Cache/DistributedCache.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Sync;
 using Umbraco.Core.Cache;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Cache
 {

src/Umbraco.Web/Cache/MediaCacheRefresher.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Xml.Linq;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
+using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Web.Cache

src/Umbraco.Web/CanvasDesignerUtility.cs

@@ -17,6 +17,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web
 {

src/Umbraco.Web/Composing/Current.cs

@@ -30,9 +30,9 @@ using Umbraco.Web.WebApi;
 using Umbraco.Web._Legacy.Actions;
 using CoreCurrent = Umbraco.Core.Composing.Current;
 
-namespace Umbraco.Web
+namespace Umbraco.Web.Composing
 {
-    // see notes in Umbraco.Core.DependencyInjection.Current.
+    // see notes in Umbraco.Core.Composing.Current.
     public static class Current
     {
         private static readonly object Locker = new object();
@@ -55,7 +55,10 @@ namespace Umbraco.Web
             CoreCurrent.Reset();
         }
 
-        private static ServiceContainer Container
+        /// <summary>
+        /// Gets the DI container.
+        /// </summary>
+        internal static IServiceContainer Container
             => CoreCurrent.Container;
 
         #region Temp & Special
@@ -69,7 +72,7 @@ namespace Umbraco.Web
                 if (_umbracoContextAccessor != null) return _umbracoContextAccessor;
                 return _umbracoContextAccessor = Container.GetInstance<IUmbracoContextAccessor>();
             }
-            set { _umbracoContextAccessor = value; } // for tests
+            set => _umbracoContextAccessor = value; // for tests
         }
 
         // clears the "current" umbraco context
@@ -158,7 +161,7 @@ namespace Umbraco.Web
         // internal - can only be accessed through Composition at compose time
         internal static Type DefaultRenderMvcControllerType
         {
-            get { return _defaultRenderMvcControllerType; }
+            get => _defaultRenderMvcControllerType;
             set
             {
                 if (value.Implements<IRenderController>() == false)

src/Umbraco.Web/CompositionExtensions.cs

@@ -1,12 +1,8 @@
 using System;
 using LightInject;
-using Umbraco.Core.Dictionary;
 using Umbraco.Core.Composing;
+using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Core.Macros;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Persistence.Mappers;
-using Umbraco.Core.Persistence.Migrations;
-using Umbraco.Core.Sync;
 using Umbraco.Web.Editors;
 using Umbraco.Web.HealthCheck;
 using Umbraco.Web.Media;
@@ -14,7 +10,6 @@ using Umbraco.Web.Media.ThumbnailProviders;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
-using Umbraco.Web.Strategies.Migrations;
 using Umbraco.Web._Legacy.Actions;
 
 // the namespace here is intentional -  although defined in Umbraco.Web assembly,
@@ -141,7 +136,7 @@ namespace Umbraco.Core.Components
         /// <param name="composition">The composition.</param>
         public static void SetDefaultRenderMvcControllerType<T>(this Composition composition)
         {
-            Web.Current.DefaultRenderMvcControllerType = typeof(T);
+            Current.DefaultRenderMvcControllerType = typeof(T);
         }
 
         /// <summary>

src/Umbraco.Web/Dictionary/UmbracoCultureDictionary.cs

@@ -11,6 +11,7 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Dictionary
 {

src/Umbraco.Web/Editors/AuthenticationController.cs

@@ -25,6 +25,7 @@ using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
+using Umbraco.Web.Composing;
 using IUser = Umbraco.Core.Models.Membership.IUser;
 
 namespace Umbraco.Web.Editors

src/Umbraco.Web/Editors/BackOfficeController.cs

@@ -36,6 +36,7 @@ using Umbraco.Web.Trees;
 using Umbraco.Web.UI.JavaScript;
 using Umbraco.Web.WebServices;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Security;
 using Action = Umbraco.Web._Legacy.Actions.Action;
 using Constants = Umbraco.Core.Constants;

src/Umbraco.Web/Editors/CodeFileController.cs

@@ -11,6 +11,7 @@ using Umbraco.Core;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;

src/Umbraco.Web/Editors/ContentControllerBase.cs

@@ -9,6 +9,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;

src/Umbraco.Web/Editors/ContentPostValidateAttribute.cs

@@ -7,6 +7,7 @@ using System.Web.Http.Filters;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Security;
 using Umbraco.Web.WebApi;

src/Umbraco.Web/Editors/ContentTypeController.cs

@@ -13,6 +13,7 @@ using Umbraco.Core;
 using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 using Umbraco.Core.Logging;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Editors
 {

src/Umbraco.Web/Editors/ContentTypeControllerBase.cs

@@ -11,6 +11,7 @@ using Umbraco.Core.Dictionary;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;

src/Umbraco.Web/Editors/DataTypeController.cs

@@ -16,6 +16,7 @@ using Umbraco.Web.WebApi.Filters;
 using Constants = Umbraco.Core.Constants;
 using System.Net.Http;
 using System.Text;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Editors
 {

src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs

@@ -11,6 +11,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.WebApi;
 

src/Umbraco.Web/Editors/MediaPostValidateAttribute.cs

@@ -7,6 +7,7 @@ using System.Web.Http.Filters;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Security;
 using Umbraco.Web.WebApi;

src/Umbraco.Web/Editors/MediaTypeController.cs

@@ -16,6 +16,7 @@ using System;
 using System.ComponentModel;
 using System.Web.Http.Controllers;
 using Umbraco.Core;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Editors
 {

src/Umbraco.Web/Editors/ValidationHelper.cs

@@ -1,11 +1,10 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
-using System.Web;
 using System.Web.Http.ModelBinding;
 using Umbraco.Core;
 using Umbraco.Core.Models.Validation;
-using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Editors
 {

src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Xml;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.HealthCheck.Checks.Config
 {

src/Umbraco.Web/HealthCheck/HealthCheckAction.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.HealthCheck
 {

src/Umbraco.Web/HtmlHelperRenderExtensions.cs

@@ -14,6 +14,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Profiling;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 using Constants = Umbraco.Core.Constants;

src/Umbraco.Web/HttpUrlHelperExtensions.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Web.Http.Routing;
 using Umbraco.Core;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
 

src/Umbraco.Web/ImageCropperBaseExtensions.cs

@@ -7,6 +7,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models;
 
 namespace Umbraco.Web

src/Umbraco.Web/Install/Controllers/InstallPackageController.cs

@@ -10,6 +10,7 @@ using umbraco;
 using Umbraco.Core;
 using Umbraco.Web.Cache;
 using Umbraco.Core.Configuration;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Install.Models;
 using Umbraco.Web.WebApi;
 

src/Umbraco.Web/Install/FilePermissionHelper.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.IO;
 using Umbraco.Core.IO;
+using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Web.Install

src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs

@@ -3,6 +3,7 @@ using System.Web.Http;
 using System.Web.Http.Controllers;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Install
 {

src/Umbraco.Web/Install/InstallAuthorizeAttribute.cs

@@ -3,6 +3,7 @@ using System.Web;
 using System.Web.Mvc;
 using Umbraco.Core;
 using Umbraco.Core.IO;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Install
 {

src/Umbraco.Web/Install/InstallHelper.cs

@@ -11,6 +11,7 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Install.InstallSteps;
 using Umbraco.Web.Install.Models;
 

src/Umbraco.Web/Install/InstallSteps/MajorVersion7UpgradeReport.cs

@@ -9,6 +9,7 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.Install.Models;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Install.InstallSteps
 {

src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs

@@ -3,6 +3,7 @@ using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Web.Cache;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Install.Models;
 using Umbraco.Web.Security;
 

src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs

@@ -5,6 +5,7 @@ using System.Web;
 using umbraco.cms.businesslogic.packager;
 using Umbraco.Core.Services;
 using Umbraco.Core.Configuration;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Install.Models;
 using Umbraco.Web.Security;
 

src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs

@@ -2,6 +2,7 @@ using System;
 using System.Linq;
 using System.Web;
 using umbraco.cms.businesslogic.packager;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Install.Models;
 
 namespace Umbraco.Web.Install.InstallSteps

src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs

@@ -2,6 +2,7 @@ using System;
 using Semver;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Install.Models;
 
 namespace Umbraco.Web.Install.InstallSteps

src/Umbraco.Web/Macros/MacroRenderer.cs

@@ -21,6 +21,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Macros;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Macros
 {

src/Umbraco.Web/Macros/UserControlMacroEngine.cs

@@ -6,6 +6,7 @@ using umbraco;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Macros
 {

src/Umbraco.Web/Macros/XsltMacroEngine.cs

@@ -18,6 +18,7 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Macros;
 using Umbraco.Core.Xml.XPath;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Templates;
 
 namespace Umbraco.Web.Macros

src/Umbraco.Web/Media/ImageUrl.cs

@@ -8,6 +8,7 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Media;
 using umbraco;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Media
 {

src/Umbraco.Web/Models/ContentExtensions.cs

@@ -5,6 +5,7 @@ using umbraco.cms.businesslogic.web;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Routing;
 using Domain = Umbraco.Web.Routing.Domain;
 

src/Umbraco.Web/Models/Mapping/AvailablePropertyEditorsResolver.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using AutoMapper;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Models;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Mapping

src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs

@@ -10,6 +10,7 @@ using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Mapping;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Trees;
 using Umbraco.Web.Routing;

src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs

@@ -5,6 +5,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Mapping

src/Umbraco.Web/Models/Mapping/DataTypeModelMapper.cs

@@ -8,6 +8,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Models.Mapping;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Mapping

src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs

@@ -2,6 +2,7 @@
 using AutoMapper;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Mapping

src/Umbraco.Web/Models/Mapping/MacroModelMapper.cs

@@ -5,6 +5,7 @@ using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Mapping;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Mapping

src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs

@@ -10,6 +10,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Mapping;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Trees;
 

src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs

@@ -13,6 +13,7 @@ using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
 using System.Linq;
 using Umbraco.Core.Security;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Trees;
 
 namespace Umbraco.Web.Models.Mapping

src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs

@@ -7,6 +7,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Mapping

src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs

@@ -8,6 +8,7 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
 using umbraco;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Models.Mapping
 {

src/Umbraco.Web/Models/PublishedProperty.cs

@@ -5,6 +5,7 @@ using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Models
 {

src/Umbraco.Web/Models/Trees/MenuItem.cs

@@ -5,6 +5,7 @@ using Umbraco.Web.Trees;
 using System.Collections.Generic;
 using Umbraco.Core;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web._Legacy.Actions;
 
 namespace Umbraco.Web.Models.Trees

src/Umbraco.Web/Models/Trees/MenuItemList.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Umbraco.Core;
+using Umbraco.Web.Composing;
 using Umbraco.Web._Legacy.Actions;
 
 namespace Umbraco.Web.Models.Trees

src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs

@@ -7,6 +7,7 @@ using System.Web.Mvc;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Mvc
 {

src/Umbraco.Web/Mvc/ContentModelBinder.cs

@@ -6,6 +6,7 @@ using System.Web;
 using System.Web.Mvc;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models;
 
 namespace Umbraco.Web.Mvc

src/Umbraco.Web/Mvc/ControllerContextExtensions.cs

@@ -1,4 +1,5 @@
 using System.Web.Mvc;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Mvc
 {

src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs

@@ -4,6 +4,7 @@ using Umbraco.Web.Routing;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;
 using LightInject;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Mvc
 {

src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs

@@ -8,6 +8,7 @@ using Umbraco.Web.Security;
 using umbraco.cms.businesslogic.member;
 using AuthorizeAttribute = System.Web.Mvc.AuthorizeAttribute;
 using Umbraco.Core;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Mvc
 {

src/Umbraco.Web/Mvc/ProfilingView.cs

@@ -2,6 +2,7 @@ using System.IO;
 using System.Web.Mvc;
 using Umbraco.Core.Logging;
 using Umbraco.Web;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Core.Profiling
 {

src/Umbraco.Web/Mvc/ProfilingViewEngine.cs

@@ -1,6 +1,7 @@
 using System.Web.Mvc;
 using Umbraco.Core.Logging;
 using Umbraco.Web;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Core.Profiling
 {

src/Umbraco.Web/Mvc/RenderRouteHandler.cs

@@ -7,10 +7,11 @@ using System.Web.Routing;
 using System.Web.SessionState;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Composing;
 using Umbraco.Web.Models;
 using Umbraco.Web.Routing;
 using System.Collections.Generic;
-using Umbraco.Core.Composing;
+using Current = Umbraco.Web.Composing.Current;
 using LightInject;
 
 namespace Umbraco.Web.Mvc

src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs

@@ -2,6 +2,7 @@
 using System.Web;
 using System.Web.Mvc;
 using Umbraco.Core;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Mvc
 {

src/Umbraco.Web/Mvc/UmbracoControllerFactory.cs

@@ -3,6 +3,7 @@ using System.Web.Mvc;
 using System.Web.Routing;
 using System.Web.SessionState;
 using Umbraco.Core;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Mvc
 {

src/Umbraco.Web/Mvc/UmbracoPageResult.cs

@@ -6,6 +6,7 @@ using System.Web.Routing;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Profiling;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Mvc
 {

src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs

@@ -10,6 +10,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Security;

src/Umbraco.Web/NotificationServiceExtensions.cs

@@ -9,6 +9,7 @@ using Umbraco.Core.Services;
 using Umbraco.Core.Models;
 using Umbraco.Web._Legacy.Actions;
 using System.Collections.Generic;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web
 {

src/Umbraco.Web/PropertyEditors/PublishValueValueEditor.cs

@@ -5,6 +5,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.PropertyEditors
 {

src/Umbraco.Web/PropertyEditors/PublishValuesMultipleValueEditor.cs

@@ -6,6 +6,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.PropertyEditors
 {

src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs

@@ -11,6 +11,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using umbraco;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.PropertyEditors
 {

src/Umbraco.Web/PublishedCache/NuCache/DataSource/Database.cs

@@ -7,6 +7,7 @@ using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Serialization;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {

src/Umbraco.Web/PublishedCache/NuCache/FacadeService.cs

@@ -23,6 +23,7 @@ using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Web.Cache;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Install;
 using Umbraco.Web.PublishedCache.NuCache.DataSource;
 using Umbraco.Web.PublishedCache.XmlPublishedCache;

src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models;
 using Umbraco.Web.PublishedCache.NuCache.DataSource;
 

src/Umbraco.Web/PublishedCache/XmlPublishedCache/PreviewContent.cs

@@ -5,6 +5,7 @@ using System.Xml;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.PublishedCache.XmlPublishedCache
 {

src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs

@@ -21,6 +21,7 @@ using UmbracoExamine;
 using umbraco;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.PublishedCache.XmlPublishedCache
 {
@@ -258,7 +259,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
             catch (AlreadyClosedException)
             {
                 //If the app domain is shutting down and the site is under heavy load the index reader will be closed and it really cannot
-                //be re-opened since the app domain is shutting down. In this case we have no option but to try to load the data from the db.                    
+                //be re-opened since the app domain is shutting down. In this case we have no option but to try to load the data from the db.
             }
             return null;
         }

src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs

@@ -8,6 +8,7 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models;
 
 namespace Umbraco.Web.PublishedCache.XmlPublishedCache

src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs

@@ -23,6 +23,7 @@ using Umbraco.Core.Services.Changes;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Xml;
 using Umbraco.Web.Cache;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Scheduling;
 using Content = umbraco.cms.businesslogic.Content;
 using File = System.IO.File;

src/Umbraco.Web/PublishedContentExtensions.cs

@@ -10,6 +10,7 @@ using Umbraco.Web.Models;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web
 {

src/Umbraco.Web/Routing/AliasUrlProvider.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
+using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Web.Routing

src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs

@@ -3,6 +3,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Routing
 {

src/Umbraco.Web/Routing/DomainHelper.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
+using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache; // Facade
 
 namespace Umbraco.Web.Routing

src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs

@@ -7,6 +7,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core.Xml;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Routing
 {

src/Umbraco.Web/Routing/RedirectTrackingComponent.cs

@@ -8,6 +8,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Components;
 using Umbraco.Core.Sync;
 using Umbraco.Web.Cache;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Redirects
 {

src/Umbraco.Web/Routing/UrlProvider.cs

@@ -6,6 +6,7 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Core;
 using Umbraco.Core.Models;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Routing
 {

src/Umbraco.Web/Routing/UrlProviderExtensions.cs

@@ -5,6 +5,7 @@ using Umbraco.Core.Services;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using LightInject;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Routing
 {

src/Umbraco.Web/Search/ExamineComponent.cs

@@ -18,6 +18,7 @@ using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Core.Sync;
 using Umbraco.Web.Cache;
+using Umbraco.Web.Composing;
 using Umbraco.Web.PropertyEditors;
 using UmbracoExamine;
 

src/Umbraco.Web/Search/LuceneIndexerExtensions.cs

@@ -7,6 +7,7 @@ using Lucene.Net.Index;
 using Lucene.Net.Search;
 using Lucene.Net.Store;
 using Umbraco.Core.Logging;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Search
 {

src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs

@@ -14,6 +14,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.Identity;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Constants = Umbraco.Core.Constants;
 
 namespace Umbraco.Web.Security.Identity

src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs

@@ -5,6 +5,7 @@ using Microsoft.Owin.Security.Cookies;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Security.Identity
 {

src/Umbraco.Web/Security/MembershipHelper.cs

@@ -14,6 +14,7 @@ using Umbraco.Web.PublishedCache;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Security.Providers;
 using MPE = global::Umbraco.Core.Security.MembershipProviderExtensions;
 

src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs

@@ -12,6 +12,7 @@ using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Core.Models.Membership;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Security.Providers
 {

src/Umbraco.Web/Security/Providers/MembersRoleProvider.cs

@@ -6,6 +6,7 @@ using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Security.Providers
 {

src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs

@@ -12,6 +12,7 @@ using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Security.Providers
 {

src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs

@@ -8,6 +8,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Security.Providers
 {

src/Umbraco.Web/Security/WebSecurity.cs

@@ -13,6 +13,7 @@ using Umbraco.Core.Security;
 using Microsoft.AspNet.Identity.Owin;
 using Microsoft.Owin;
 using Umbraco.Core.Models.Identity;
+using Umbraco.Web.Composing;
 using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings;
 
 namespace Umbraco.Web.Security

src/Umbraco.Web/Strategies/DatabaseServerRegistrarAndMessengerComponent.cs

@@ -18,6 +18,7 @@ using Umbraco.Web.Routing;
 using Umbraco.Web.Scheduling;
 using LightInject;
 using Umbraco.Core.Exceptions;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Strategies
 {

src/Umbraco.Web/Strategies/Migrations/RebuildXmlCachesAfterUpgrade.cs

@@ -4,6 +4,7 @@ using Umbraco.Core;
 using Umbraco.Core.Events;
 using Umbraco.Core.Persistence.Migrations;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache.XmlPublishedCache;
 using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings;
 

src/Umbraco.Web/Strategies/PublicAccessComponent.cs

@@ -1,6 +1,7 @@
 using Umbraco.Core;
 using Umbraco.Core.Components;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Strategies
 {

src/Umbraco.Web/Templates/TemplateRenderer.cs

@@ -14,6 +14,7 @@ using umbraco.cms.businesslogic.language;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Services;
 using LightInject;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Templates
 {

src/Umbraco.Web/Templates/TemplateUtilities.cs

@@ -4,6 +4,7 @@ using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.Templates

src/Umbraco.Web/Trees/ApplicationTreeController.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using System.Web.Http;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Models.Trees;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;