Rename DI to Composing

src/Umbraco.Compat7/Core/ApplicationContext.cs

@@ -12,24 +12,24 @@ namespace Umbraco.Core
     {
         private ApplicationContext()
         {
-            DatabaseContext = new DatabaseContext(DI.Current.Container.GetInstance<IUmbracoDatabaseFactory>());
+            DatabaseContext = new DatabaseContext(Composing.Current.Container.GetInstance<IUmbracoDatabaseFactory>());
         }
 
         public static ApplicationContext Current { get; } = new ApplicationContext();
 
-        public CacheHelper ApplicationCache => DI.Current.ApplicationCache;
+        public CacheHelper ApplicationCache => Composing.Current.ApplicationCache;
 
-        public ProfilingLogger ProfilingLogger => DI.Current.ProfilingLogger;
+        public ProfilingLogger ProfilingLogger => Composing.Current.ProfilingLogger;
 
         public bool IsReady { get; } = true; // because... not accessible before we are ready
 
-        public bool IsConfigured => DI.Current.RuntimeState.Level == RuntimeLevel.Run;
+        public bool IsConfigured => Composing.Current.RuntimeState.Level == RuntimeLevel.Run;
 
-	    public bool IsUpgrading => DI.Current.RuntimeState.Level == RuntimeLevel.Upgrade;
+	    public bool IsUpgrading => Composing.Current.RuntimeState.Level == RuntimeLevel.Upgrade;
 
         public DatabaseContext DatabaseContext { get; }
 
-        public ServiceContext Services => DI.Current.Services;
+        public ServiceContext Services => Composing.Current.Services;
 
         public void Dispose()
         { }

src/Umbraco.Compat7/Core/Cache/CacheRefreshersResolver.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 using LightInject;
 
 // ReSharper disable once CheckNamespace

src/Umbraco.Compat7/Core/Dictionary/CultureDictionaryFactoryResolver.cs

@@ -1,5 +1,5 @@
-using Umbraco.Core.DI;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using Umbraco.Core.Composing;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.Dictionary

src/Umbraco.Compat7/Core/Logging/LoggerResolver.cs

@@ -1,5 +1,5 @@
 using System;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.Logging

src/Umbraco.Compat7/Core/Logging/ProfilerResolver.cs

@@ -1,5 +1,5 @@
 using System;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.Logging

src/Umbraco.Compat7/Core/Models/PublishedContent/PublishedContentModelFactoryResolver.cs

@@ -1,5 +1,5 @@
-using Umbraco.Core.DI;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using Umbraco.Core.Composing;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.Models.PublishedContent

src/Umbraco.Compat7/Core/ObjectResolution/LazyManyObjectsResolverBase.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.ObjectResolution

src/Umbraco.Compat7/Core/ObjectResolution/ManyObjectsResolverBase.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.ObjectResolution

src/Umbraco.Compat7/Core/ObjectResolution/WeightedObjectsResolverBase.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.ObjectResolution

src/Umbraco.Compat7/Core/Persistence/Migrations/MigrationResolver.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 using LightInject;
 
 // ReSharper disable once CheckNamespace

src/Umbraco.Compat7/Core/PropertyEditors/PropertyEditorResolver.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 using LightInject;
 using LightInject;
 

src/Umbraco.Compat7/Core/PropertyEditors/PropertyValueConvertersResolver.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 using LightInject;
 
 // ReSharper disable once CheckNamespace

src/Umbraco.Compat7/Core/Strings/ShortStringHelperResolver.cs

@@ -1,5 +1,5 @@
-using Umbraco.Core.DI;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using Umbraco.Core.Composing;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.Strings

src/Umbraco.Compat7/Core/Strings/UrlSegmentProviderResolver.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 using LightInject;
 
 // ReSharper disable once CheckNamespace

src/Umbraco.Compat7/Core/Sync/ServerMessengerResolver.cs

@@ -1,5 +1,5 @@
-using Umbraco.Core.DI;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using Umbraco.Core.Composing;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.Sync

src/Umbraco.Compat7/Core/Sync/ServerRegistrarResolver.cs

@@ -1,5 +1,5 @@
-using Umbraco.Core.DI;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using Umbraco.Core.Composing;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.Sync

src/Umbraco.Compat7/Web/HealthCheck/HealthCheckResolver.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 using LightInject;
 
 // ReSharper disable once CheckNamespace

src/Umbraco.Compat7/Web/Media/ThumbnailProvidersResolver.cs

@@ -2,7 +2,7 @@
 using Umbraco.Core.Media;
 using Umbraco.Core.ObjectResolution;
 using Umbraco.Web.Media.ThumbnailProviders;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 using WebCurrent = Umbraco.Web.Current;
 using LightInject;
 

src/Umbraco.Compat7/Web/Mvc/FilteredControllerFactoriesResolver.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 using WebCurrent = Umbraco.Web.Current;
 using LightInject;
 

src/Umbraco.Compat7/Web/Routing/ContentFinderResolver.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 using WebCurrent = Umbraco.Web.Current;
 using LightInject;
 

src/Umbraco.Compat7/Web/Routing/ContentLastChangeFinderResolver.cs

@@ -1,6 +1,6 @@
 using System;
-using Umbraco.Core.DI;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using Umbraco.Core.Composing;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 using WebCurrent = Umbraco.Web.Current;
 
 // ReSharper disable once CheckNamespace

src/Umbraco.Compat7/Web/Routing/SiteDomainHelperResolver.cs

@@ -1,5 +1,5 @@
-using Umbraco.Core.DI;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using Umbraco.Core.Composing;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 using WebCurrent = Umbraco.Web.Current;
 
 // ReSharper disable once CheckNamespace

src/Umbraco.Compat7/Web/Routing/UrlProviderResolver.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
-using CoreCurrent = Umbraco.Core.DI.Current;
+using CoreCurrent = Umbraco.Core.Composing.Current;
 using WebCurrent = Umbraco.Web.Current;
 using LightInject;
 

src/Umbraco.Core/Cache/CacheRefresherCollection.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Cache
 {

src/Umbraco.Core/Cache/CacheRefresherCollectionBuilder.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using LightInject;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Cache
 {

src/Umbraco.Core/Components/CompositionExtensions.cs

@@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
 using LightInject;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Dictionary;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.Persistence.Migrations;

src/Umbraco.Core/Composing/BuilderCollectionBase.cs

@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Umbraco.Core.DI
+namespace Umbraco.Core.Composing
 {
     /// <summary>
     /// Provides a base class for builder collections.

src/Umbraco.Core/Composing/CollectionBuilderBase.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using LightInject;
 
-namespace Umbraco.Core.DI
+namespace Umbraco.Core.Composing
 {
     /// <summary>
     /// Provides a base class for collection builders.

src/Umbraco.Core/Composing/CompositionRoots/ConfigurationCompositionRoot.cs

@@ -2,7 +2,7 @@ using LightInject;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 
-namespace Umbraco.Core.DI.CompositionRoots
+namespace Umbraco.Core.Composing.CompositionRoots
 {
     /// <summary>
     /// Sets up IoC container for Umbraco configuration classes

src/Umbraco.Core/Composing/CompositionRoots/CoreModelMappersCompositionRoot.cs

@@ -1,7 +1,7 @@
 using LightInject;
 using Umbraco.Core.Models.Identity;
 
-namespace Umbraco.Core.DI.CompositionRoots
+namespace Umbraco.Core.Composing.CompositionRoots
 {
     public sealed class CoreModelMappersCompositionRoot : ICompositionRoot
     {

src/Umbraco.Core/Composing/CompositionRoots/RepositoryCompositionRoot.cs

@@ -5,7 +5,7 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.DI.CompositionRoots
+namespace Umbraco.Core.Composing.CompositionRoots
 {
     /// <summary>
     /// Sets the IoC container for the umbraco data layer/repositories/sql/database/etc...

src/Umbraco.Core/Composing/CompositionRoots/ServicesCompositionRoot.cs

@@ -8,7 +8,7 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Services;
 
-namespace Umbraco.Core.DI.CompositionRoots
+namespace Umbraco.Core.Composing.CompositionRoots
 {
     public sealed class ServicesCompositionRoot : ICompositionRoot
     {

src/Umbraco.Core/Composing/Current.cs

@@ -15,7 +15,7 @@ using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
 using Umbraco.Core._Legacy.PackageActions;
 
-namespace Umbraco.Core.DI
+namespace Umbraco.Core.Composing
 {
     /// <summary>
     /// Provides a static service locator for most singletons.

src/Umbraco.Core/Composing/IBuilderCollection.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Umbraco.Core.DI
+namespace Umbraco.Core.Composing
 {
     /// <summary>
     /// Represents a builder collection, ie an immutable enumeration of items.

src/Umbraco.Core/Composing/ICollectionBuilder.cs

@@ -1,4 +1,4 @@
-namespace Umbraco.Core.DI
+namespace Umbraco.Core.Composing
 {
     /// <summary>
     /// Represents a collection builder.

src/Umbraco.Core/Composing/LazyCollectionBuilderBase.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using LightInject;
 
-namespace Umbraco.Core.DI
+namespace Umbraco.Core.Composing
 {
     /// <summary>
     /// Implements a lazy collection builder.

src/Umbraco.Core/Composing/LightInjectExtensions.cs

@@ -5,7 +5,7 @@ using System.Reflection;
 using LightInject;
 using Umbraco.Core.Exceptions;
 
-namespace Umbraco.Core.DI
+namespace Umbraco.Core.Composing
 {
     /// <summary>
     /// Provides extensions to LightInject.

src/Umbraco.Core/Composing/MixedLightInjectScopeManagerProvider.cs

@@ -1,7 +1,7 @@
 using LightInject;
 using LightInject.Web;
 
-namespace Umbraco.Core.DI
+namespace Umbraco.Core.Composing
 {
     // by default, the container's scope manager provider is PerThreadScopeManagerProvider,
     // and then container.EnablePerWebRequestScope() replaces it with PerWebRequestScopeManagerProvider,

src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using LightInject;
 
-namespace Umbraco.Core.DI
+namespace Umbraco.Core.Composing
 {
     /// <summary>
     /// Implements an ordered collection builder.

src/Umbraco.Core/Composing/WeightAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Core.DI
+namespace Umbraco.Core.Composing
 {
     /// <summary>
     /// Specifies the weight of pretty much anything.

src/Umbraco.Core/Composing/WeightedCollectionBuilderBase.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using LightInject;
 
-namespace Umbraco.Core.DI
+namespace Umbraco.Core.Composing
 {
     /// <summary>
     /// Implements a weighted collection builder.

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -10,7 +10,7 @@ using System.Web.Security;
 using System.Xml;
 using System.Xml.Linq;
 using System.Xml.XPath;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Security;

src/Umbraco.Core/Configuration/UmbracoConfig.cs

@@ -5,7 +5,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration.Dashboard;
 using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Configuration

src/Umbraco.Core/CoreRuntime.cs

@@ -8,7 +8,7 @@ using Semver;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Components;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;

src/Umbraco.Core/CoreRuntimeComponent.cs

@@ -8,8 +8,8 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Components;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.DI;
-using Umbraco.Core.DI.CompositionRoots;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Composing.CompositionRoots;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;

src/Umbraco.Core/Events/QueuingEventDispatcher.cs

@@ -1,4 +1,4 @@
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 
 namespace Umbraco.Core.Events

src/Umbraco.Core/IO/FileSystems.cs

@@ -39,7 +39,7 @@ namespace Umbraco.Core.IO
         // DI wants a public ctor
         // but IScopeProviderInternal is not public
         public FileSystems(/*IScopeProviderInternal scopeProvider,*/ ILogger logger)
-            : this(DI.Current.ScopeProvider as IScopeProviderInternal, logger)
+            : this(Composing.Current.ScopeProvider as IScopeProviderInternal, logger)
         { }
 
         internal FileSystems(IScopeProviderInternal scopeProvider, ILogger logger)

src/Umbraco.Core/IO/MediaFileSystem.cs

@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 using LightInject;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Media;

src/Umbraco.Core/IO/PhysicalFileSystem.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 

src/Umbraco.Core/Logging/ImageProcessorLogger.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using ImageProcessor.Common.Exceptions;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Logging
 {   

src/Umbraco.Core/Logging/OwinLoggerFactory.cs

@@ -1,6 +1,6 @@
 using System;
 using Microsoft.Owin.Logging;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Logging
 {

src/Umbraco.Core/Macros/XsltExtensionCollection.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Macros
 {

src/Umbraco.Core/Macros/XsltExtensionCollectionBuilder.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using LightInject;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Macros
 {

src/Umbraco.Core/Models/ContentExtensions.cs

@@ -7,7 +7,7 @@ using System.Web;
 using System.Xml.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Membership;

src/Umbraco.Core/Models/Member.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Models

src/Umbraco.Core/Models/Membership/MembershipUserExtensions.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Web.Security;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 

src/Umbraco.Core/Models/PropertyExtensions.cs

@@ -2,7 +2,7 @@
 using System.Xml;
 using System.Xml.Linq;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 

src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs

@@ -1,5 +1,5 @@
 using System;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Models.PublishedContent
 {

src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Xml.Linq;
 using System.Xml.XPath;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Core.Models.PublishedContent

src/Umbraco.Core/Packaging/PackageBinaryInspector.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Reflection;
 using System.Security;
 using System.Security.Permissions;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Packaging

src/Umbraco.Core/Persistence/DbConnectionExtensions.cs

@@ -5,7 +5,7 @@ using System.Data.SqlClient;
 using System.Data.SqlServerCe;
 using System.Linq;
 using MySql.Data.MySqlClient;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.FaultHandling;
 

src/Umbraco.Core/Persistence/Mappers/IMapperCollection.cs

@@ -1,5 +1,5 @@
 using System;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Persistence.Mappers
 {

src/Umbraco.Core/Persistence/Mappers/MapperCollection.cs

@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Persistence.Mappers
 {

src/Umbraco.Core/Persistence/Mappers/MapperCollectionBuilder.cs

@@ -1,5 +1,5 @@
 using LightInject;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Persistence.Mappers
 {

src/Umbraco.Core/Persistence/Migrations/MigrationCollection.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Persistence.Migrations
 {

src/Umbraco.Core/Persistence/Migrations/MigrationCollectionBuilder.cs

@@ -1,5 +1,5 @@
 using LightInject;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Persistence.Migrations
 {

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateControlIdToPropertyEditorAlias.cs

@@ -1,6 +1,6 @@
 using System;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.PropertyEditors;
 

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NPoco;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;

src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using LightInject;
 using NPoco;
 using Umbraco.Core.Cache;
-using Umbraco.Core.DI;
-using Umbraco.Core.DI.CompositionRoots;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Composing.CompositionRoots;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;

src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs

@@ -5,8 +5,8 @@ using LightInject;
 using NPoco;
 using Semver;
 using Umbraco.Core.Cache;
-using Umbraco.Core.DI;
-using Umbraco.Core.DI.CompositionRoots;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Composing.CompositionRoots;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;

src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using LightInject;
 using NPoco;
 using Umbraco.Core.Cache;
-using Umbraco.Core.DI;
-using Umbraco.Core.DI.CompositionRoots;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Composing.CompositionRoots;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;

src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using LightInject;
 using NPoco;
 using Umbraco.Core.Cache;
-using Umbraco.Core.DI;
-using Umbraco.Core.DI.CompositionRoots;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Composing.CompositionRoots;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;

src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using LightInject;
 using NPoco;
 using Umbraco.Core.Cache;
-using Umbraco.Core.DI;
-using Umbraco.Core.DI.CompositionRoots;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Composing.CompositionRoots;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;

src/Umbraco.Core/Persistence/Repositories/UserRepository.cs

@@ -5,7 +5,7 @@ using System.Linq.Expressions;
 using NPoco;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;

src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using NPoco;
 using Umbraco.Core.Cache;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;

src/Umbraco.Core/Plugins/TypeFinder.cs

@@ -7,7 +7,7 @@ using System.Security;
 using System.Text;
 using System.Web;
 using System.Web.Compilation;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 
 namespace Umbraco.Core.Plugins

src/Umbraco.Core/PropertyEditors/LegacyPropertyEditorIdToAliasConverter.cs

@@ -3,7 +3,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.PropertyEditors

src/Umbraco.Core/PropertyEditors/ManifestPropertyValidator.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Newtonsoft.Json;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Models;
 using Umbraco.Core.Serialization;
 

src/Umbraco.Core/PropertyEditors/ParameterEditorCollection.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.PropertyEditors
 {

src/Umbraco.Core/PropertyEditors/ParameterEditorCollectionBuilder.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using LightInject;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Manifest;
 
 namespace Umbraco.Core.PropertyEditors

src/Umbraco.Core/PropertyEditors/PreValueEditor.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Newtonsoft.Json;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;

src/Umbraco.Core/PropertyEditors/PropertyEditorCollection.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.PropertyEditors
 {

src/Umbraco.Core/PropertyEditors/PropertyEditorCollectionBuilder.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using LightInject;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Manifest;
 
 namespace Umbraco.Core.PropertyEditors

src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollection.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.PropertyEditors
 {

src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollectionBuilder.cs

@@ -1,5 +1,5 @@
 using LightInject;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.PropertyEditors
 {

src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs

@@ -4,7 +4,7 @@ using System.Globalization;
 using System.Linq;
 using System.Xml.Linq;
 using Newtonsoft.Json;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Models;

src/Umbraco.Core/PropertyEditors/ValidatorCollection.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.PropertyEditors
 {

src/Umbraco.Core/PropertyEditors/ValidatorCollectionBuilder.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using LightInject;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.PropertyEditors
 {

src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs

@@ -5,7 +5,7 @@ using System.Web;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;

src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs

@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;

src/Umbraco.Core/PropertyEditors/ValueConverters/JsonValueConverter.cs

@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
 

src/Umbraco.Core/Scoping/ScopeProvider.cs

@@ -5,7 +5,7 @@ using System.Data;
 using System.Runtime.Remoting.Messaging;
 using System.Text;
 using System.Web;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;

src/Umbraco.Core/Security/AuthenticationExtensions.cs

@@ -15,7 +15,7 @@ using AutoMapper;
 using Microsoft.Owin;
 using Newtonsoft.Json;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Logging;
 

src/Umbraco.Core/Security/MembershipProviderBase.cs

@@ -8,7 +8,7 @@ using System.Web;
 using System.Web.Configuration;
 using System.Web.Hosting;
 using System.Web.Security;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 

src/Umbraco.Core/Services/EntityXmlSerializer.cs

@@ -6,7 +6,7 @@ using System.Web;
 using System.Xml;
 using System.Xml.Linq;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.PropertyEditors;

src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs

@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Threading;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Dictionary;
 
 namespace Umbraco.Core.Services

src/Umbraco.Core/Services/LocalizedTextServiceFileSources.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Xml;
 using System.Xml.Linq;
 using Umbraco.Core.Cache;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Services

src/Umbraco.Core/Services/PackagingService.cs

@@ -12,7 +12,7 @@ using System.Xml.XPath;
 using Newtonsoft.Json;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Events;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.IO;

src/Umbraco.Core/Services/TagExtractor.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;

src/Umbraco.Core/Strategies/ManifestWatcherComponent.cs

@@ -1,6 +1,6 @@
 using System.IO;
 using Umbraco.Core.Components;
-using Umbraco.Core.DI;
+using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;