diff --git a/src/Umbraco.Compat7/Core/ApplicationContext.cs b/src/Umbraco.Compat7/Core/ApplicationContext.cs index 9b763989df..bfc672fdaa 100644 --- a/src/Umbraco.Compat7/Core/ApplicationContext.cs +++ b/src/Umbraco.Compat7/Core/ApplicationContext.cs @@ -12,24 +12,24 @@ namespace Umbraco.Core { private ApplicationContext() { - DatabaseContext = new DatabaseContext(DI.Current.Container.GetInstance()); + DatabaseContext = new DatabaseContext(Composing.Current.Container.GetInstance()); } 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() { } diff --git a/src/Umbraco.Compat7/Core/Cache/CacheRefreshersResolver.cs b/src/Umbraco.Compat7/Core/Cache/CacheRefreshersResolver.cs index 2bbc1775c0..afee038a51 100644 --- a/src/Umbraco.Compat7/Core/Cache/CacheRefreshersResolver.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Core/Dictionary/CultureDictionaryFactoryResolver.cs b/src/Umbraco.Compat7/Core/Dictionary/CultureDictionaryFactoryResolver.cs index f88ef811f8..10bab2f875 100644 --- a/src/Umbraco.Compat7/Core/Dictionary/CultureDictionaryFactoryResolver.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Core/Logging/LoggerResolver.cs b/src/Umbraco.Compat7/Core/Logging/LoggerResolver.cs index aaa285f711..c98ae29962 100644 --- a/src/Umbraco.Compat7/Core/Logging/LoggerResolver.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Core/Logging/ProfilerResolver.cs b/src/Umbraco.Compat7/Core/Logging/ProfilerResolver.cs index b034c2c90e..08263be451 100644 --- a/src/Umbraco.Compat7/Core/Logging/ProfilerResolver.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Core/Models/PublishedContent/PublishedContentModelFactoryResolver.cs b/src/Umbraco.Compat7/Core/Models/PublishedContent/PublishedContentModelFactoryResolver.cs index 7eeac98f52..a8774743c6 100644 --- a/src/Umbraco.Compat7/Core/Models/PublishedContent/PublishedContentModelFactoryResolver.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Core/ObjectResolution/LazyManyObjectsResolverBase.cs b/src/Umbraco.Compat7/Core/ObjectResolution/LazyManyObjectsResolverBase.cs index 6a7dbf3fc3..d9b0dbc4d4 100644 --- a/src/Umbraco.Compat7/Core/ObjectResolution/LazyManyObjectsResolverBase.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Core/ObjectResolution/ManyObjectsResolverBase.cs b/src/Umbraco.Compat7/Core/ObjectResolution/ManyObjectsResolverBase.cs index 233b59e95f..92e412e367 100644 --- a/src/Umbraco.Compat7/Core/ObjectResolution/ManyObjectsResolverBase.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Core/ObjectResolution/WeightedObjectsResolverBase.cs b/src/Umbraco.Compat7/Core/ObjectResolution/WeightedObjectsResolverBase.cs index d9496394be..d665cd6be5 100644 --- a/src/Umbraco.Compat7/Core/ObjectResolution/WeightedObjectsResolverBase.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Core/Persistence/Migrations/MigrationResolver.cs b/src/Umbraco.Compat7/Core/Persistence/Migrations/MigrationResolver.cs index dd840a0db0..1997b9be8d 100644 --- a/src/Umbraco.Compat7/Core/Persistence/Migrations/MigrationResolver.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Core/PropertyEditors/PropertyEditorResolver.cs b/src/Umbraco.Compat7/Core/PropertyEditors/PropertyEditorResolver.cs index 29508b4552..3c63ada35e 100644 --- a/src/Umbraco.Compat7/Core/PropertyEditors/PropertyEditorResolver.cs +++ b/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; diff --git a/src/Umbraco.Compat7/Core/PropertyEditors/PropertyValueConvertersResolver.cs b/src/Umbraco.Compat7/Core/PropertyEditors/PropertyValueConvertersResolver.cs index b8ff2780a4..466403db6e 100644 --- a/src/Umbraco.Compat7/Core/PropertyEditors/PropertyValueConvertersResolver.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Core/Strings/ShortStringHelperResolver.cs b/src/Umbraco.Compat7/Core/Strings/ShortStringHelperResolver.cs index e0fa6dfa46..f4929154fa 100644 --- a/src/Umbraco.Compat7/Core/Strings/ShortStringHelperResolver.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Core/Strings/UrlSegmentProviderResolver.cs b/src/Umbraco.Compat7/Core/Strings/UrlSegmentProviderResolver.cs index 57bbd23580..97300d166b 100644 --- a/src/Umbraco.Compat7/Core/Strings/UrlSegmentProviderResolver.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Core/Sync/ServerMessengerResolver.cs b/src/Umbraco.Compat7/Core/Sync/ServerMessengerResolver.cs index 69d3c055c1..b4316335e3 100644 --- a/src/Umbraco.Compat7/Core/Sync/ServerMessengerResolver.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Core/Sync/ServerRegistrarResolver.cs b/src/Umbraco.Compat7/Core/Sync/ServerRegistrarResolver.cs index 18b331a0a0..156d1c2968 100644 --- a/src/Umbraco.Compat7/Core/Sync/ServerRegistrarResolver.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Web/HealthCheck/HealthCheckResolver.cs b/src/Umbraco.Compat7/Web/HealthCheck/HealthCheckResolver.cs index 891fb4323e..092ca9fb8e 100644 --- a/src/Umbraco.Compat7/Web/HealthCheck/HealthCheckResolver.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Web/Media/ThumbnailProvidersResolver.cs b/src/Umbraco.Compat7/Web/Media/ThumbnailProvidersResolver.cs index 1ae07cbcc6..2acf1f3e92 100644 --- a/src/Umbraco.Compat7/Web/Media/ThumbnailProvidersResolver.cs +++ b/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; diff --git a/src/Umbraco.Compat7/Web/Mvc/FilteredControllerFactoriesResolver.cs b/src/Umbraco.Compat7/Web/Mvc/FilteredControllerFactoriesResolver.cs index 200052bed8..e4cefbc3df 100644 --- a/src/Umbraco.Compat7/Web/Mvc/FilteredControllerFactoriesResolver.cs +++ b/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; diff --git a/src/Umbraco.Compat7/Web/Routing/ContentFinderResolver.cs b/src/Umbraco.Compat7/Web/Routing/ContentFinderResolver.cs index 94976db7a8..b4fc891f31 100644 --- a/src/Umbraco.Compat7/Web/Routing/ContentFinderResolver.cs +++ b/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; diff --git a/src/Umbraco.Compat7/Web/Routing/ContentLastChangeFinderResolver.cs b/src/Umbraco.Compat7/Web/Routing/ContentLastChangeFinderResolver.cs index 2a4c611f8b..424eba8f26 100644 --- a/src/Umbraco.Compat7/Web/Routing/ContentLastChangeFinderResolver.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Web/Routing/SiteDomainHelperResolver.cs b/src/Umbraco.Compat7/Web/Routing/SiteDomainHelperResolver.cs index 5e11f77e67..21b6df6137 100644 --- a/src/Umbraco.Compat7/Web/Routing/SiteDomainHelperResolver.cs +++ b/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 diff --git a/src/Umbraco.Compat7/Web/Routing/UrlProviderResolver.cs b/src/Umbraco.Compat7/Web/Routing/UrlProviderResolver.cs index 04314eee0f..632d62a197 100644 --- a/src/Umbraco.Compat7/Web/Routing/UrlProviderResolver.cs +++ b/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; diff --git a/src/Umbraco.Core/Cache/CacheRefresherCollection.cs b/src/Umbraco.Core/Cache/CacheRefresherCollection.cs index ae5b7ed4b2..e0b3cd48fd 100644 --- a/src/Umbraco.Core/Cache/CacheRefresherCollection.cs +++ b/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 { diff --git a/src/Umbraco.Core/Cache/CacheRefresherCollectionBuilder.cs b/src/Umbraco.Core/Cache/CacheRefresherCollectionBuilder.cs index a05b26c055..11ac05844b 100644 --- a/src/Umbraco.Core/Cache/CacheRefresherCollectionBuilder.cs +++ b/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 { diff --git a/src/Umbraco.Core/Components/CompositionExtensions.cs b/src/Umbraco.Core/Components/CompositionExtensions.cs index 1c47a47c64..bab16ed3b4 100644 --- a/src/Umbraco.Core/Components/CompositionExtensions.cs +++ b/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; diff --git a/src/Umbraco.Core/DI/BuilderCollectionBase.cs b/src/Umbraco.Core/Composing/BuilderCollectionBase.cs similarity index 97% rename from src/Umbraco.Core/DI/BuilderCollectionBase.cs rename to src/Umbraco.Core/Composing/BuilderCollectionBase.cs index 2089da0bdc..e516dd3ce7 100644 --- a/src/Umbraco.Core/DI/BuilderCollectionBase.cs +++ b/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 { /// /// Provides a base class for builder collections. diff --git a/src/Umbraco.Core/DI/CollectionBuilderBase.cs b/src/Umbraco.Core/Composing/CollectionBuilderBase.cs similarity index 99% rename from src/Umbraco.Core/DI/CollectionBuilderBase.cs rename to src/Umbraco.Core/Composing/CollectionBuilderBase.cs index eedda0ee2a..2e08b44867 100644 --- a/src/Umbraco.Core/DI/CollectionBuilderBase.cs +++ b/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 { /// /// Provides a base class for collection builders. diff --git a/src/Umbraco.Core/DI/CompositionRoots/ConfigurationCompositionRoot.cs b/src/Umbraco.Core/Composing/CompositionRoots/ConfigurationCompositionRoot.cs similarity index 94% rename from src/Umbraco.Core/DI/CompositionRoots/ConfigurationCompositionRoot.cs rename to src/Umbraco.Core/Composing/CompositionRoots/ConfigurationCompositionRoot.cs index 141a3f770b..5721f5d2b4 100644 --- a/src/Umbraco.Core/DI/CompositionRoots/ConfigurationCompositionRoot.cs +++ b/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 { /// /// Sets up IoC container for Umbraco configuration classes diff --git a/src/Umbraco.Core/DI/CompositionRoots/CoreModelMappersCompositionRoot.cs b/src/Umbraco.Core/Composing/CompositionRoots/CoreModelMappersCompositionRoot.cs similarity index 84% rename from src/Umbraco.Core/DI/CompositionRoots/CoreModelMappersCompositionRoot.cs rename to src/Umbraco.Core/Composing/CompositionRoots/CoreModelMappersCompositionRoot.cs index ee0fefec82..9e1054d3c8 100644 --- a/src/Umbraco.Core/DI/CompositionRoots/CoreModelMappersCompositionRoot.cs +++ b/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 { diff --git a/src/Umbraco.Core/DI/CompositionRoots/RepositoryCompositionRoot.cs b/src/Umbraco.Core/Composing/CompositionRoots/RepositoryCompositionRoot.cs similarity index 99% rename from src/Umbraco.Core/DI/CompositionRoots/RepositoryCompositionRoot.cs rename to src/Umbraco.Core/Composing/CompositionRoots/RepositoryCompositionRoot.cs index 755da337bf..dec91bbd0d 100644 --- a/src/Umbraco.Core/DI/CompositionRoots/RepositoryCompositionRoot.cs +++ b/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 { /// /// Sets the IoC container for the umbraco data layer/repositories/sql/database/etc... diff --git a/src/Umbraco.Core/DI/CompositionRoots/ServicesCompositionRoot.cs b/src/Umbraco.Core/Composing/CompositionRoots/ServicesCompositionRoot.cs similarity index 99% rename from src/Umbraco.Core/DI/CompositionRoots/ServicesCompositionRoot.cs rename to src/Umbraco.Core/Composing/CompositionRoots/ServicesCompositionRoot.cs index 11042dce90..71cfef3c55 100644 --- a/src/Umbraco.Core/DI/CompositionRoots/ServicesCompositionRoot.cs +++ b/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 { diff --git a/src/Umbraco.Core/DI/Current.cs b/src/Umbraco.Core/Composing/Current.cs similarity index 99% rename from src/Umbraco.Core/DI/Current.cs rename to src/Umbraco.Core/Composing/Current.cs index dbbf6dc3d2..17dafcce4e 100644 --- a/src/Umbraco.Core/DI/Current.cs +++ b/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 { /// /// Provides a static service locator for most singletons. diff --git a/src/Umbraco.Core/DI/IBuilderCollection.cs b/src/Umbraco.Core/Composing/IBuilderCollection.cs similarity index 92% rename from src/Umbraco.Core/DI/IBuilderCollection.cs rename to src/Umbraco.Core/Composing/IBuilderCollection.cs index 0326082c6f..3ce729392d 100644 --- a/src/Umbraco.Core/DI/IBuilderCollection.cs +++ b/src/Umbraco.Core/Composing/IBuilderCollection.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Umbraco.Core.DI +namespace Umbraco.Core.Composing { /// /// Represents a builder collection, ie an immutable enumeration of items. diff --git a/src/Umbraco.Core/DI/ICollectionBuilder.cs b/src/Umbraco.Core/Composing/ICollectionBuilder.cs similarity index 94% rename from src/Umbraco.Core/DI/ICollectionBuilder.cs rename to src/Umbraco.Core/Composing/ICollectionBuilder.cs index 7813cb7f84..b57876d073 100644 --- a/src/Umbraco.Core/DI/ICollectionBuilder.cs +++ b/src/Umbraco.Core/Composing/ICollectionBuilder.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Core.DI +namespace Umbraco.Core.Composing { /// /// Represents a collection builder. diff --git a/src/Umbraco.Core/DI/LazyCollectionBuilderBase.cs b/src/Umbraco.Core/Composing/LazyCollectionBuilderBase.cs similarity index 99% rename from src/Umbraco.Core/DI/LazyCollectionBuilderBase.cs rename to src/Umbraco.Core/Composing/LazyCollectionBuilderBase.cs index 2c821a972c..a8f87a8760 100644 --- a/src/Umbraco.Core/DI/LazyCollectionBuilderBase.cs +++ b/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 { /// /// Implements a lazy collection builder. diff --git a/src/Umbraco.Core/DI/LightInjectExtensions.cs b/src/Umbraco.Core/Composing/LightInjectExtensions.cs similarity index 99% rename from src/Umbraco.Core/DI/LightInjectExtensions.cs rename to src/Umbraco.Core/Composing/LightInjectExtensions.cs index ff5973d962..db713a4be5 100644 --- a/src/Umbraco.Core/DI/LightInjectExtensions.cs +++ b/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 { /// /// Provides extensions to LightInject. diff --git a/src/Umbraco.Core/DI/MixedLightInjectScopeManagerProvider.cs b/src/Umbraco.Core/Composing/MixedLightInjectScopeManagerProvider.cs similarity index 98% rename from src/Umbraco.Core/DI/MixedLightInjectScopeManagerProvider.cs rename to src/Umbraco.Core/Composing/MixedLightInjectScopeManagerProvider.cs index 3b7fbe1ff9..05bdbc446d 100644 --- a/src/Umbraco.Core/DI/MixedLightInjectScopeManagerProvider.cs +++ b/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, diff --git a/src/Umbraco.Core/DI/OrderedCollectionBuilderBase.cs b/src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs similarity index 99% rename from src/Umbraco.Core/DI/OrderedCollectionBuilderBase.cs rename to src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs index 97aca7fc0c..4811551cd2 100644 --- a/src/Umbraco.Core/DI/OrderedCollectionBuilderBase.cs +++ b/src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using LightInject; -namespace Umbraco.Core.DI +namespace Umbraco.Core.Composing { /// /// Implements an ordered collection builder. diff --git a/src/Umbraco.Core/DI/WeightAttribute.cs b/src/Umbraco.Core/Composing/WeightAttribute.cs similarity index 95% rename from src/Umbraco.Core/DI/WeightAttribute.cs rename to src/Umbraco.Core/Composing/WeightAttribute.cs index adf6bec76a..aeec84de09 100644 --- a/src/Umbraco.Core/DI/WeightAttribute.cs +++ b/src/Umbraco.Core/Composing/WeightAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Core.DI +namespace Umbraco.Core.Composing { /// /// Specifies the weight of pretty much anything. diff --git a/src/Umbraco.Core/DI/WeightedCollectionBuilderBase.cs b/src/Umbraco.Core/Composing/WeightedCollectionBuilderBase.cs similarity index 99% rename from src/Umbraco.Core/DI/WeightedCollectionBuilderBase.cs rename to src/Umbraco.Core/Composing/WeightedCollectionBuilderBase.cs index 87c9952141..cec44a2ab3 100644 --- a/src/Umbraco.Core/DI/WeightedCollectionBuilderBase.cs +++ b/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 { /// /// Implements a weighted collection builder. diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs index ede64c2d24..7336939cbd 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettings.cs +++ b/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; diff --git a/src/Umbraco.Core/Configuration/UmbracoConfig.cs b/src/Umbraco.Core/Configuration/UmbracoConfig.cs index d77a677d67..77bb82c95f 100644 --- a/src/Umbraco.Core/Configuration/UmbracoConfig.cs +++ b/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 diff --git a/src/Umbraco.Core/CoreRuntime.cs b/src/Umbraco.Core/CoreRuntime.cs index 9ede68364d..ceb3bbc4b4 100644 --- a/src/Umbraco.Core/CoreRuntime.cs +++ b/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; diff --git a/src/Umbraco.Core/CoreRuntimeComponent.cs b/src/Umbraco.Core/CoreRuntimeComponent.cs index d77decfb07..459009c7e7 100644 --- a/src/Umbraco.Core/CoreRuntimeComponent.cs +++ b/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; diff --git a/src/Umbraco.Core/Events/QueuingEventDispatcher.cs b/src/Umbraco.Core/Events/QueuingEventDispatcher.cs index f7a186502b..11630a956c 100644 --- a/src/Umbraco.Core/Events/QueuingEventDispatcher.cs +++ b/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 diff --git a/src/Umbraco.Core/IO/FileSystems.cs b/src/Umbraco.Core/IO/FileSystems.cs index e21c4a6b6f..6c2448af3a 100644 --- a/src/Umbraco.Core/IO/FileSystems.cs +++ b/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) diff --git a/src/Umbraco.Core/IO/MediaFileSystem.cs b/src/Umbraco.Core/IO/MediaFileSystem.cs index 5df4771efe..c8264532ec 100644 --- a/src/Umbraco.Core/IO/MediaFileSystem.cs +++ b/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; diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs index 77a2baebdb..d9d6083dfb 100644 --- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs +++ b/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; diff --git a/src/Umbraco.Core/Logging/ImageProcessorLogger.cs b/src/Umbraco.Core/Logging/ImageProcessorLogger.cs index 0c156fce59..760304f42c 100644 --- a/src/Umbraco.Core/Logging/ImageProcessorLogger.cs +++ b/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 { diff --git a/src/Umbraco.Core/Logging/OwinLoggerFactory.cs b/src/Umbraco.Core/Logging/OwinLoggerFactory.cs index bceefa429c..31805b2edc 100644 --- a/src/Umbraco.Core/Logging/OwinLoggerFactory.cs +++ b/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 { diff --git a/src/Umbraco.Core/Macros/XsltExtensionCollection.cs b/src/Umbraco.Core/Macros/XsltExtensionCollection.cs index ecfad76619..da5de187d5 100644 --- a/src/Umbraco.Core/Macros/XsltExtensionCollection.cs +++ b/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 { diff --git a/src/Umbraco.Core/Macros/XsltExtensionCollectionBuilder.cs b/src/Umbraco.Core/Macros/XsltExtensionCollectionBuilder.cs index 7df9a2d462..b1d278e20f 100644 --- a/src/Umbraco.Core/Macros/XsltExtensionCollectionBuilder.cs +++ b/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 { diff --git a/src/Umbraco.Core/Models/ContentExtensions.cs b/src/Umbraco.Core/Models/ContentExtensions.cs index e4212a5202..0a78259f8d 100644 --- a/src/Umbraco.Core/Models/ContentExtensions.cs +++ b/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; diff --git a/src/Umbraco.Core/Models/Member.cs b/src/Umbraco.Core/Models/Member.cs index 6502919588..b8d0bb9655 100644 --- a/src/Umbraco.Core/Models/Member.cs +++ b/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 diff --git a/src/Umbraco.Core/Models/Membership/MembershipUserExtensions.cs b/src/Umbraco.Core/Models/Membership/MembershipUserExtensions.cs index 8010f464b1..2b0b6d3e0d 100644 --- a/src/Umbraco.Core/Models/Membership/MembershipUserExtensions.cs +++ b/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; diff --git a/src/Umbraco.Core/Models/PropertyExtensions.cs b/src/Umbraco.Core/Models/PropertyExtensions.cs index 37126213e0..c88970668a 100644 --- a/src/Umbraco.Core/Models/PropertyExtensions.cs +++ b/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; diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs index 6cc3eb638b..6f293a5dc6 100644 --- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs +++ b/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 { diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs index 22a41bcf50..497331e584 100644 --- a/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs +++ b/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 diff --git a/src/Umbraco.Core/Packaging/PackageBinaryInspector.cs b/src/Umbraco.Core/Packaging/PackageBinaryInspector.cs index c64f32ffc4..484a67dd9b 100644 --- a/src/Umbraco.Core/Packaging/PackageBinaryInspector.cs +++ b/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 diff --git a/src/Umbraco.Core/Persistence/DbConnectionExtensions.cs b/src/Umbraco.Core/Persistence/DbConnectionExtensions.cs index 97b5d987ab..885ef78263 100644 --- a/src/Umbraco.Core/Persistence/DbConnectionExtensions.cs +++ b/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; diff --git a/src/Umbraco.Core/Persistence/Mappers/IMapperCollection.cs b/src/Umbraco.Core/Persistence/Mappers/IMapperCollection.cs index 3f6c2c6cac..dfa6a7ca5b 100644 --- a/src/Umbraco.Core/Persistence/Mappers/IMapperCollection.cs +++ b/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 { diff --git a/src/Umbraco.Core/Persistence/Mappers/MapperCollection.cs b/src/Umbraco.Core/Persistence/Mappers/MapperCollection.cs index bc10fc4758..f1badefc2d 100644 --- a/src/Umbraco.Core/Persistence/Mappers/MapperCollection.cs +++ b/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 { diff --git a/src/Umbraco.Core/Persistence/Mappers/MapperCollectionBuilder.cs b/src/Umbraco.Core/Persistence/Mappers/MapperCollectionBuilder.cs index d782345fec..1210cda63a 100644 --- a/src/Umbraco.Core/Persistence/Mappers/MapperCollectionBuilder.cs +++ b/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 { diff --git a/src/Umbraco.Core/Persistence/Migrations/MigrationCollection.cs b/src/Umbraco.Core/Persistence/Migrations/MigrationCollection.cs index af6b56385a..e1029fa5a3 100644 --- a/src/Umbraco.Core/Persistence/Migrations/MigrationCollection.cs +++ b/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 { diff --git a/src/Umbraco.Core/Persistence/Migrations/MigrationCollectionBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/MigrationCollectionBuilder.cs index 0c9164fab8..6f36074ad2 100644 --- a/src/Umbraco.Core/Persistence/Migrations/MigrationCollectionBuilder.cs +++ b/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 { diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateControlIdToPropertyEditorAlias.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateControlIdToPropertyEditorAlias.cs index c6eff6cf55..76c3de62a1 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateControlIdToPropertyEditorAlias.cs +++ b/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; diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs index 56c02f16c7..b4ab81a4c1 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs +++ b/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; diff --git a/src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs b/src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs index 86b8ae4d27..e223f20637 100644 --- a/src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs +++ b/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; diff --git a/src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs index e065db4b8b..d6de7b8b1a 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs +++ b/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; diff --git a/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs index a6baff1b7c..1992bdd52a 100644 --- a/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs +++ b/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; diff --git a/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs index e99e3a2662..8e4eb97d55 100644 --- a/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs +++ b/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; diff --git a/src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs index 8a96c77ae6..7409bbc2f0 100644 --- a/src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs +++ b/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; diff --git a/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs index 488c8eb6bd..d58c099073 100644 --- a/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs +++ b/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; diff --git a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs index 2fb0b6cd49..09d2e0df81 100644 --- a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs +++ b/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; diff --git a/src/Umbraco.Core/Plugins/TypeFinder.cs b/src/Umbraco.Core/Plugins/TypeFinder.cs index 4c209d1ead..b7cddafbd2 100644 --- a/src/Umbraco.Core/Plugins/TypeFinder.cs +++ b/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 diff --git a/src/Umbraco.Core/PropertyEditors/LegacyPropertyEditorIdToAliasConverter.cs b/src/Umbraco.Core/PropertyEditors/LegacyPropertyEditorIdToAliasConverter.cs index 14f678274b..b6180eedf0 100644 --- a/src/Umbraco.Core/PropertyEditors/LegacyPropertyEditorIdToAliasConverter.cs +++ b/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 diff --git a/src/Umbraco.Core/PropertyEditors/ManifestPropertyValidator.cs b/src/Umbraco.Core/PropertyEditors/ManifestPropertyValidator.cs index 62587781b1..59aa0e9163 100644 --- a/src/Umbraco.Core/PropertyEditors/ManifestPropertyValidator.cs +++ b/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; diff --git a/src/Umbraco.Core/PropertyEditors/ParameterEditorCollection.cs b/src/Umbraco.Core/PropertyEditors/ParameterEditorCollection.cs index cc0bdbfe41..ae86adbd26 100644 --- a/src/Umbraco.Core/PropertyEditors/ParameterEditorCollection.cs +++ b/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 { diff --git a/src/Umbraco.Core/PropertyEditors/ParameterEditorCollectionBuilder.cs b/src/Umbraco.Core/PropertyEditors/ParameterEditorCollectionBuilder.cs index efe6fa82f1..015fc19af6 100644 --- a/src/Umbraco.Core/PropertyEditors/ParameterEditorCollectionBuilder.cs +++ b/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 diff --git a/src/Umbraco.Core/PropertyEditors/PreValueEditor.cs b/src/Umbraco.Core/PropertyEditors/PreValueEditor.cs index 00c2653651..13a6061cb3 100644 --- a/src/Umbraco.Core/PropertyEditors/PreValueEditor.cs +++ b/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; diff --git a/src/Umbraco.Core/PropertyEditors/PropertyEditorCollection.cs b/src/Umbraco.Core/PropertyEditors/PropertyEditorCollection.cs index add020228c..9a10613dbb 100644 --- a/src/Umbraco.Core/PropertyEditors/PropertyEditorCollection.cs +++ b/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 { diff --git a/src/Umbraco.Core/PropertyEditors/PropertyEditorCollectionBuilder.cs b/src/Umbraco.Core/PropertyEditors/PropertyEditorCollectionBuilder.cs index f6617a5619..587261ae1e 100644 --- a/src/Umbraco.Core/PropertyEditors/PropertyEditorCollectionBuilder.cs +++ b/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 diff --git a/src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollection.cs b/src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollection.cs index 1f5c8fe029..4b321debfb 100644 --- a/src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollection.cs +++ b/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 { diff --git a/src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollectionBuilder.cs b/src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollectionBuilder.cs index d61ca26a74..9cbd70b362 100644 --- a/src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollectionBuilder.cs +++ b/src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollectionBuilder.cs @@ -1,5 +1,5 @@ using LightInject; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Core.PropertyEditors { diff --git a/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs b/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs index d1c35f0953..004e45a170 100644 --- a/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs +++ b/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; diff --git a/src/Umbraco.Core/PropertyEditors/ValidatorCollection.cs b/src/Umbraco.Core/PropertyEditors/ValidatorCollection.cs index bc7eb03cbc..607499a116 100644 --- a/src/Umbraco.Core/PropertyEditors/ValidatorCollection.cs +++ b/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 { diff --git a/src/Umbraco.Core/PropertyEditors/ValidatorCollectionBuilder.cs b/src/Umbraco.Core/PropertyEditors/ValidatorCollectionBuilder.cs index 71fb6dd0a9..d98d85d994 100644 --- a/src/Umbraco.Core/PropertyEditors/ValidatorCollectionBuilder.cs +++ b/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 { diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs index c0e950a8e0..d8679642bc 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs +++ b/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; diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs index 176dbc3915..8c1220639d 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs +++ b/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; diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/JsonValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/JsonValueConverter.cs index 032abb9ffe..fb33a1bcbc 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/JsonValueConverter.cs +++ b/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; diff --git a/src/Umbraco.Core/Scoping/ScopeProvider.cs b/src/Umbraco.Core/Scoping/ScopeProvider.cs index 7333ef9af7..abd3bea8cf 100644 --- a/src/Umbraco.Core/Scoping/ScopeProvider.cs +++ b/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; diff --git a/src/Umbraco.Core/Security/AuthenticationExtensions.cs b/src/Umbraco.Core/Security/AuthenticationExtensions.cs index 7a5c13c2df..13613cc89d 100644 --- a/src/Umbraco.Core/Security/AuthenticationExtensions.cs +++ b/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; diff --git a/src/Umbraco.Core/Security/MembershipProviderBase.cs b/src/Umbraco.Core/Security/MembershipProviderBase.cs index d9cad61d1d..663f090859 100644 --- a/src/Umbraco.Core/Security/MembershipProviderBase.cs +++ b/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; diff --git a/src/Umbraco.Core/Services/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/EntityXmlSerializer.cs index bf951ef9fa..07fce9182a 100644 --- a/src/Umbraco.Core/Services/EntityXmlSerializer.cs +++ b/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; diff --git a/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs b/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs index c23df091d4..e7526f6e34 100644 --- a/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs +++ b/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 diff --git a/src/Umbraco.Core/Services/LocalizedTextServiceFileSources.cs b/src/Umbraco.Core/Services/LocalizedTextServiceFileSources.cs index 3ab72ce6b1..ad68ce1089 100644 --- a/src/Umbraco.Core/Services/LocalizedTextServiceFileSources.cs +++ b/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 diff --git a/src/Umbraco.Core/Services/PackagingService.cs b/src/Umbraco.Core/Services/PackagingService.cs index bc971e40ad..3fa6467ed8 100644 --- a/src/Umbraco.Core/Services/PackagingService.cs +++ b/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; diff --git a/src/Umbraco.Core/Services/TagExtractor.cs b/src/Umbraco.Core/Services/TagExtractor.cs index 9456689653..a9c17fb48f 100644 --- a/src/Umbraco.Core/Services/TagExtractor.cs +++ b/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; diff --git a/src/Umbraco.Core/Strategies/ManifestWatcherComponent.cs b/src/Umbraco.Core/Strategies/ManifestWatcherComponent.cs index fa508029e6..a46c96edf9 100644 --- a/src/Umbraco.Core/Strategies/ManifestWatcherComponent.cs +++ b/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; diff --git a/src/Umbraco.Core/Strategies/RelateOnCopyComponent.cs b/src/Umbraco.Core/Strategies/RelateOnCopyComponent.cs index d37d452d34..8290fdeefe 100644 --- a/src/Umbraco.Core/Strategies/RelateOnCopyComponent.cs +++ b/src/Umbraco.Core/Strategies/RelateOnCopyComponent.cs @@ -1,6 +1,6 @@ using System; using Umbraco.Core.Components; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Core.Services; diff --git a/src/Umbraco.Core/Strategies/RelateOnTrashComponent.cs b/src/Umbraco.Core/Strategies/RelateOnTrashComponent.cs index 8cc77b5de6..5912ca90fc 100644 --- a/src/Umbraco.Core/Strategies/RelateOnTrashComponent.cs +++ b/src/Umbraco.Core/Strategies/RelateOnTrashComponent.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using Umbraco.Core.Components; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Events; using Umbraco.Core.Models; using Umbraco.Core.Services; diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs index 326dec948e..97be4958a9 100644 --- a/src/Umbraco.Core/StringExtensions.cs +++ b/src/Umbraco.Core/StringExtensions.cs @@ -15,7 +15,7 @@ using Umbraco.Core.Configuration; using System.Web.Security; using Umbraco.Core.Strings; using Umbraco.Core.CodeAnnotations; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.IO; namespace Umbraco.Core diff --git a/src/Umbraco.Core/Strings/UrlSegmentProviderCollection.cs b/src/Umbraco.Core/Strings/UrlSegmentProviderCollection.cs index 13ab673e0c..ba434f6a0d 100644 --- a/src/Umbraco.Core/Strings/UrlSegmentProviderCollection.cs +++ b/src/Umbraco.Core/Strings/UrlSegmentProviderCollection.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Core.Strings { diff --git a/src/Umbraco.Core/Strings/UrlSegmentProviderCollectionBuilder.cs b/src/Umbraco.Core/Strings/UrlSegmentProviderCollectionBuilder.cs index 45a2bbd079..a9b8234e14 100644 --- a/src/Umbraco.Core/Strings/UrlSegmentProviderCollectionBuilder.cs +++ b/src/Umbraco.Core/Strings/UrlSegmentProviderCollectionBuilder.cs @@ -1,5 +1,5 @@ using LightInject; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Core.Strings { diff --git a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs index 1ec9898618..d0e3ca70bf 100644 --- a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs +++ b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs @@ -2,7 +2,7 @@ using System; using System.Web; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.IO; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs b/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs index d0eb3543e3..d974b68989 100644 --- a/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs +++ b/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs @@ -10,7 +10,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NPoco; using Umbraco.Core.Cache; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Models.Rdbms; diff --git a/src/Umbraco.Core/Sync/ServerMessengerBase.cs b/src/Umbraco.Core/Sync/ServerMessengerBase.cs index 5076634ea1..b20c7f9f45 100644 --- a/src/Umbraco.Core/Sync/ServerMessengerBase.cs +++ b/src/Umbraco.Core/Sync/ServerMessengerBase.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using Newtonsoft.Json; using Umbraco.Core.Cache; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; namespace Umbraco.Core.Sync diff --git a/src/Umbraco.Core/Sync/WebServiceServerMessenger.cs b/src/Umbraco.Core/Sync/WebServiceServerMessenger.cs index aef92c8688..0e39473992 100644 --- a/src/Umbraco.Core/Sync/WebServiceServerMessenger.cs +++ b/src/Umbraco.Core/Sync/WebServiceServerMessenger.cs @@ -8,7 +8,7 @@ using Newtonsoft.Json; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; using Umbraco.Core.Cache; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Core.Sync { diff --git a/src/Umbraco.Core/Udi.cs b/src/Umbraco.Core/Udi.cs index d8d6615a90..19258f5c17 100644 --- a/src/Umbraco.Core/Udi.cs +++ b/src/Umbraco.Core/Udi.cs @@ -5,7 +5,7 @@ using System.ComponentModel; using System.Linq; using System.Reflection; using Umbraco.Core.Deploy; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Plugins; namespace Umbraco.Core diff --git a/src/Umbraco.Core/UmbracoApplicationBase.cs b/src/Umbraco.Core/UmbracoApplicationBase.cs index 0a543d29de..f4f6468afa 100644 --- a/src/Umbraco.Core/UmbracoApplicationBase.cs +++ b/src/Umbraco.Core/UmbracoApplicationBase.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.Hosting; using log4net; using LightInject; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; namespace Umbraco.Core diff --git a/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollection.cs b/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollection.cs index 9457bcbe59..92fce9ce85 100644 --- a/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollection.cs +++ b/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollection.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Core._Legacy.PackageActions { diff --git a/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollectionBuilder.cs b/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollectionBuilder.cs index 4fb3d9a3d0..01ed8ebf66 100644 --- a/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollectionBuilder.cs +++ b/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollectionBuilder.cs @@ -1,5 +1,5 @@ using LightInject; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Core._Legacy.PackageActions { diff --git a/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs b/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs index 087ea3a506..c286b7228c 100644 --- a/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs +++ b/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs @@ -6,7 +6,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Sync; diff --git a/src/Umbraco.Tests/CoreThings/TryConvertToTests.cs b/src/Umbraco.Tests/CoreThings/TryConvertToTests.cs index d91832777b..39e541aa38 100644 --- a/src/Umbraco.Tests/CoreThings/TryConvertToTests.cs +++ b/src/Umbraco.Tests/CoreThings/TryConvertToTests.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Strings; using Umbraco.Tests.TestHelpers; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Tests.Testing; namespace Umbraco.Tests.CoreThings diff --git a/src/Umbraco.Tests/DependencyInjection/CollectionBuildersTests.cs b/src/Umbraco.Tests/DependencyInjection/CollectionBuildersTests.cs index f6aa5f7c4d..544852bca8 100644 --- a/src/Umbraco.Tests/DependencyInjection/CollectionBuildersTests.cs +++ b/src/Umbraco.Tests/DependencyInjection/CollectionBuildersTests.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using LightInject; using NUnit.Framework; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Tests.DI { diff --git a/src/Umbraco.Tests/DependencyInjection/LazyCollectionBuilderTests.cs b/src/Umbraco.Tests/DependencyInjection/LazyCollectionBuilderTests.cs index 91988f2b5a..9fba1e9e39 100644 --- a/src/Umbraco.Tests/DependencyInjection/LazyCollectionBuilderTests.cs +++ b/src/Umbraco.Tests/DependencyInjection/LazyCollectionBuilderTests.cs @@ -4,7 +4,7 @@ using System.Linq; using LightInject; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Tests.DI { diff --git a/src/Umbraco.Tests/DependencyInjection/PackageActionCollectionTests.cs b/src/Umbraco.Tests/DependencyInjection/PackageActionCollectionTests.cs index 4617dbcf6a..31be4a13a8 100644 --- a/src/Umbraco.Tests/DependencyInjection/PackageActionCollectionTests.cs +++ b/src/Umbraco.Tests/DependencyInjection/PackageActionCollectionTests.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Xml; using LightInject; using NUnit.Framework; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Plugins; using Umbraco.Core._Legacy.PackageActions; diff --git a/src/Umbraco.Tests/DependencyInjection/ResolverBaseTest.cs b/src/Umbraco.Tests/DependencyInjection/ResolverBaseTest.cs index 0f95bb6c0f..a910aaa2f3 100644 --- a/src/Umbraco.Tests/DependencyInjection/ResolverBaseTest.cs +++ b/src/Umbraco.Tests/DependencyInjection/ResolverBaseTest.cs @@ -3,7 +3,7 @@ using System.Reflection; using Moq; using NUnit.Framework; using Umbraco.Core.Cache; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Plugins; diff --git a/src/Umbraco.Tests/IO/FileSystemsTests.cs b/src/Umbraco.Tests/IO/FileSystemsTests.cs index 4e8d01a485..490eb06117 100644 --- a/src/Umbraco.Tests/IO/FileSystemsTests.cs +++ b/src/Umbraco.Tests/IO/FileSystemsTests.cs @@ -6,7 +6,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Services; diff --git a/src/Umbraco.Tests/Integration/ContentEventsTests.cs b/src/Umbraco.Tests/Integration/ContentEventsTests.cs index 55b587cec5..0ff3ab93f2 100644 --- a/src/Umbraco.Tests/Integration/ContentEventsTests.cs +++ b/src/Umbraco.Tests/Integration/ContentEventsTests.cs @@ -6,7 +6,7 @@ using Moq; using NUnit.Framework; 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.Persistence.Repositories; diff --git a/src/Umbraco.Tests/Issues/U9560.cs b/src/Umbraco.Tests/Issues/U9560.cs index 751aeed576..8f690933df 100644 --- a/src/Umbraco.Tests/Issues/U9560.cs +++ b/src/Umbraco.Tests/Issues/U9560.cs @@ -19,7 +19,7 @@ namespace Umbraco.Tests.Issues contentType.Name = "test"; var propertyType = new PropertyType("test", DataTypeDatabaseType.Ntext, "prop") { Name = "Prop", Description = "", Mandatory = false, SortOrder = 1, DataTypeDefinitionId = -88 }; contentType.PropertyTypeCollection.Add(propertyType); - Core.DI.Current.Services.ContentTypeService.Save(contentType); + Core.Composing.Current.Services.ContentTypeService.Save(contentType); var aliasName = string.Empty; diff --git a/src/Umbraco.Tests/Macros/MacroTests.cs b/src/Umbraco.Tests/Macros/MacroTests.cs index c26da1de08..5a76a540ef 100644 --- a/src/Umbraco.Tests/Macros/MacroTests.cs +++ b/src/Umbraco.Tests/Macros/MacroTests.cs @@ -17,7 +17,7 @@ using Umbraco.Web; using Umbraco.Web.Macros; using File = System.IO.File; using Macro = umbraco.cms.businesslogic.macro.Macro; -using Current = Umbraco.Core.DI.Current; +using Current = Umbraco.Core.Composing.Current; namespace Umbraco.Tests.Macros { diff --git a/src/Umbraco.Tests/Migrations/MigrationIssuesTests.cs b/src/Umbraco.Tests/Migrations/MigrationIssuesTests.cs index 2260391ce8..42ca600d2e 100644 --- a/src/Umbraco.Tests/Migrations/MigrationIssuesTests.cs +++ b/src/Umbraco.Tests/Migrations/MigrationIssuesTests.cs @@ -5,7 +5,7 @@ using Moq; using NUnit.Framework; using Semver; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence.Migrations; diff --git a/src/Umbraco.Tests/Migrations/Upgrades/BaseUpgradeTest.cs b/src/Umbraco.Tests/Migrations/Upgrades/BaseUpgradeTest.cs index 18c57ea88f..f1998c2042 100644 --- a/src/Umbraco.Tests/Migrations/Upgrades/BaseUpgradeTest.cs +++ b/src/Umbraco.Tests/Migrations/Upgrades/BaseUpgradeTest.cs @@ -5,7 +5,7 @@ using NPoco; using NUnit.Framework; using Semver; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Migrations; diff --git a/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs b/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs index 99d5e99085..46c0a89227 100644 --- a/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs +++ b/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs @@ -6,7 +6,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Sync; diff --git a/src/Umbraco.Tests/Misc/LibraryTests.cs b/src/Umbraco.Tests/Misc/LibraryTests.cs index 5976e932f3..2b0bdd36b0 100644 --- a/src/Umbraco.Tests/Misc/LibraryTests.cs +++ b/src/Umbraco.Tests/Misc/LibraryTests.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Linq; using NUnit.Framework; using umbraco; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.PropertyEditors; using Umbraco.Tests.PublishedContent; diff --git a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs index 65f257329d..3baa7be101 100644 --- a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs +++ b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs @@ -5,7 +5,7 @@ using AutoMapper; using Moq; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; diff --git a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs index 38418a411d..eb48082ad8 100644 --- a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs +++ b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs @@ -12,7 +12,7 @@ using Umbraco.Core.PropertyEditors; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Web.Models.ContentEditing; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Plugins; using Umbraco.Tests.Testing; using Current = Umbraco.Web.Current; diff --git a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs index a65c4b197d..0f07ff3c57 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs @@ -8,7 +8,7 @@ using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.UnitOfWork; using Umbraco.Tests.TestHelpers; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Tests.Testing; using LightInject; diff --git a/src/Umbraco.Tests/Persistence/Repositories/PartialViewRepositoryTests.cs b/src/Umbraco.Tests/Persistence/Repositories/PartialViewRepositoryTests.cs index b3a1346ba5..359ead000b 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/PartialViewRepositoryTests.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/PartialViewRepositoryTests.cs @@ -5,7 +5,7 @@ using Umbraco.Core.Models; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.UnitOfWork; using Umbraco.Core.PropertyEditors; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Tests.Testing; namespace Umbraco.Tests.Persistence.Repositories diff --git a/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs index 10c06d6e97..c5e5573e26 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs @@ -4,7 +4,7 @@ using System.Text; using Moq; using NUnit.Framework; using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.IO; using Umbraco.Core.Models; using Umbraco.Core.Persistence.Repositories; diff --git a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs index a4988e1659..34776f1c18 100644 --- a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs +++ b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json; using NUnit.Framework; using Newtonsoft.Json.Linq; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; @@ -84,7 +84,7 @@ namespace Umbraco.Tests.PropertyEditors } finally { - Core.DI.Current.Reset(); + Core.Composing.Current.Reset(); } } diff --git a/src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs b/src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs index 4c79f5f61d..e0ad7a86f1 100644 --- a/src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs +++ b/src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs @@ -5,7 +5,7 @@ using Moq; using NUnit.Framework; 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.Profiling; diff --git a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs index e25ab0678a..1e57a9bfc3 100644 --- a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs +++ b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs @@ -4,7 +4,7 @@ using LightInject; using Moq; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs index 90d81877bd..275eaed97d 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs @@ -9,8 +9,8 @@ using Umbraco.Core.Plugins; using Umbraco.Web.PublishedCache; using Umbraco.Web.Routing; using Umbraco.Web.Security; -using Umbraco.Core.DI; -using Current = Umbraco.Core.DI.Current; +using Umbraco.Core.Composing; +using Current = Umbraco.Core.Composing.Current; using LightInject; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs index df8e6ba005..f1311ab869 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs @@ -1,5 +1,5 @@ using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.PropertyEditors; using Umbraco.Core.PropertyEditors.ValueConverters; diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs index 979fa52c1b..9370da60e6 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs @@ -9,8 +9,8 @@ using Umbraco.Core.Plugins; using Umbraco.Core.PropertyEditors; using Umbraco.Web; using Umbraco.Web.PublishedCache; -using Umbraco.Core.DI; -using Current = Umbraco.Core.DI.Current; +using Umbraco.Core.Composing; +using Current = Umbraco.Core.Composing.Current; using LightInject; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs index 78c69db6a9..b16adfd13c 100644 --- a/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs +++ b/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs @@ -8,7 +8,7 @@ using Umbraco.Core.Services; using Umbraco.Tests.TestHelpers; using Umbraco.Web.PublishedCache.XmlPublishedCache; using Umbraco.Web.Routing; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Tests.Routing { diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs index 00d2772f5e..771c4de5cc 100644 --- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs +++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs @@ -16,7 +16,7 @@ using Umbraco.Web.Mvc; using Umbraco.Web.Routing; using Umbraco.Web.WebApi; using Umbraco.Core.Strings; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Tests.Testing; using Current = Umbraco.Web.Current; diff --git a/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs b/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs index 9176dc888d..ea86d15b6a 100644 --- a/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs +++ b/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Moq; using NUnit.Framework; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Tests.TestHelpers; diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs index a9be087839..40123f9ab4 100644 --- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs +++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs @@ -6,7 +6,7 @@ using Umbraco.Tests.TestHelpers; using Umbraco.Web.PublishedCache.XmlPublishedCache; using Umbraco.Web.Routing; using Umbraco.Core.Services; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Tests.Routing { diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs index 4bf355fda7..07749a9db7 100644 --- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs +++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs @@ -7,7 +7,7 @@ using NUnit.Framework; using Semver; using Umbraco.Core; using Umbraco.Core.Components; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; using Umbraco.Tests.TestHelpers; diff --git a/src/Umbraco.Tests/Scoping/ScopeFileSystemsTests.cs b/src/Umbraco.Tests/Scoping/ScopeFileSystemsTests.cs index 249cf7ab24..7b19d639d0 100644 --- a/src/Umbraco.Tests/Scoping/ScopeFileSystemsTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopeFileSystemsTests.cs @@ -3,7 +3,7 @@ using System.IO; using System.Text; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.IO; using Umbraco.Core.Scoping; using Umbraco.Tests.TestHelpers; diff --git a/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs b/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs index c1ed427788..9884fc11c6 100644 --- a/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using NUnit.Framework; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; using Umbraco.Core.Scoping; diff --git a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs index 348901c3fe..d2fb6d3068 100644 --- a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs @@ -3,7 +3,7 @@ using System.Collections; using Moq; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Events; using Umbraco.Core.Logging; using Umbraco.Core.Models; diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs index b5bcd6f146..aec7780e82 100644 --- a/src/Umbraco.Tests/Services/MemberServiceTests.cs +++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs @@ -4,7 +4,7 @@ using System.Linq; using NPoco; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Events; using Umbraco.Core.Models; using Umbraco.Core.Models.EntityBase; diff --git a/src/Umbraco.Tests/Services/PerformanceTests.cs b/src/Umbraco.Tests/Services/PerformanceTests.cs index 0e5062bda5..da9e9f95bc 100644 --- a/src/Umbraco.Tests/Services/PerformanceTests.cs +++ b/src/Umbraco.Tests/Services/PerformanceTests.cs @@ -5,7 +5,7 @@ using System.Linq; using NPoco; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Models.Rdbms; diff --git a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs index 6a74636e63..b2be6179fb 100644 --- a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs +++ b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs @@ -9,7 +9,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Strings; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests/Strings/StringExtensionsTests.cs b/src/Umbraco.Tests/Strings/StringExtensionsTests.cs index e7e28cc1d7..f79bba72b9 100644 --- a/src/Umbraco.Tests/Strings/StringExtensionsTests.cs +++ b/src/Umbraco.Tests/Strings/StringExtensionsTests.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Globalization; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Strings; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs index 1d34e0a0d8..1ae781351e 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs @@ -8,7 +8,7 @@ using Umbraco.Core.Logging; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Profiling; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Persistence; using Umbraco.Core.Plugins; diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs index 66b28d5882..aaf3a39037 100644 --- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs +++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs @@ -7,7 +7,7 @@ using Moq; using NPoco; using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Events; using Umbraco.Core.IO; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs index 39893edfbc..2c892d9163 100644 --- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs +++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs @@ -25,7 +25,7 @@ using Umbraco.Web.Security; using Umbraco.Core.Plugins; using Umbraco.Web.Routing; using File = System.IO.File; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Scoping; using Umbraco.Tests.TestHelpers.Stubs; @@ -55,15 +55,15 @@ namespace Umbraco.Tests.TestHelpers protected CacheHelper DisabledCache => _disabledCacheHelper ?? (_disabledCacheHelper = CacheHelper.CreateDisabledCacheHelper()); - protected IScopeUnitOfWorkProvider UowProvider => Core.DI.Current.Container.GetInstance(); + protected IScopeUnitOfWorkProvider UowProvider => Core.Composing.Current.Container.GetInstance(); protected PublishedContentTypeCache ContentTypesCache { get; private set; } protected override ISqlSyntaxProvider SqlSyntax => GetSyntaxProvider(); - protected ServiceContext ServiceContext => Core.DI.Current.Services; + protected ServiceContext ServiceContext => Core.Composing.Current.Services; - protected IScopeProvider ScopeProvider => Core.DI.Current.ScopeProvider; + protected IScopeProvider ScopeProvider => Core.Composing.Current.ScopeProvider; public override void SetUp() { @@ -240,18 +240,18 @@ namespace Umbraco.Tests.TestHelpers var cache = new NullCacheProvider(); ContentTypesCache = new PublishedContentTypeCache( - Core.DI.Current.Services.ContentTypeService, - Core.DI.Current.Services.MediaTypeService, - Core.DI.Current.Services.MemberTypeService, - Core.DI.Current.Logger); + Core.Composing.Current.Services.ContentTypeService, + Core.Composing.Current.Services.MediaTypeService, + Core.Composing.Current.Services.MemberTypeService, + Core.Composing.Current.Logger); // testing=true so XmlStore will not use the file nor the database var facadeAccessor = new TestFacadeAccessor(); var service = new FacadeService( - Core.DI.Current.Services, - (IScopeProviderInternal) Core.DI.Current.ScopeProvider, + Core.Composing.Current.Services, + (IScopeProviderInternal) Core.Composing.Current.ScopeProvider, UowProvider, - cache, facadeAccessor, Core.DI.Current.Logger, ContentTypesCache, null, true, Options.FacadeServiceRepositoryEvents); + cache, facadeAccessor, Core.Composing.Current.Logger, ContentTypesCache, null, true, Options.FacadeServiceRepositoryEvents); // initialize PublishedCacheService content with an Xml source service.XmlStore.GetXmlDocument = () => @@ -321,7 +321,7 @@ namespace Umbraco.Tests.TestHelpers } catch (Exception ex) { - Core.DI.Current.Logger.Error("Could not remove the old database file", ex); + Core.Composing.Current.Logger.Error("Could not remove the old database file", ex); // swallow this exception - that's because a sub class might require further teardown logic onFail?.Invoke(ex); @@ -348,7 +348,7 @@ namespace Umbraco.Tests.TestHelpers var umbracoContext = new UmbracoContext( httpContext, service, - new WebSecurity(httpContext, Core.DI.Current.Services.UserService), + new WebSecurity(httpContext, Core.Composing.Current.Services.UserService), umbracoSettings ?? SettingsForTests.GetDefault(), urlProviders ?? Enumerable.Empty()); diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs index 556446702e..fe5a4c337c 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs @@ -9,8 +9,8 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Components; -using Umbraco.Core.DI; -using Umbraco.Core.DI.CompositionRoots; +using Umbraco.Core.Composing; +using Umbraco.Core.Composing.CompositionRoots; using Umbraco.Core.Events; using Umbraco.Core.IO; using Umbraco.Core.Logging; @@ -31,7 +31,7 @@ using Umbraco.Web; using Umbraco.Web.DI; using Umbraco.Web.Services; using UmbracoExamine; -using Current = Umbraco.Core.DI.Current; +using Current = Umbraco.Core.Composing.Current; namespace Umbraco.Tests.Testing { diff --git a/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs b/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs index db6204cdf8..5c91208096 100644 --- a/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs +++ b/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs @@ -3,7 +3,7 @@ using System.IO; using LightInject; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Profiling; diff --git a/src/Umbraco.Web/CompositionExtensions.cs b/src/Umbraco.Web/CompositionExtensions.cs index c7198b4d0e..31677dbfe3 100644 --- a/src/Umbraco.Web/CompositionExtensions.cs +++ b/src/Umbraco.Web/CompositionExtensions.cs @@ -1,7 +1,7 @@ using System; using LightInject; using Umbraco.Core.Dictionary; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Macros; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Persistence.Mappers; diff --git a/src/Umbraco.Web/Current.cs b/src/Umbraco.Web/Current.cs index 4bafad0e81..32b66d5c54 100644 --- a/src/Umbraco.Web/Current.cs +++ b/src/Umbraco.Web/Current.cs @@ -28,7 +28,7 @@ using Umbraco.Web.PublishedCache; using Umbraco.Web.Routing; using Umbraco.Web.WebApi; using Umbraco.Web._Legacy.Actions; -using CoreCurrent = Umbraco.Core.DI.Current; +using CoreCurrent = Umbraco.Core.Composing.Current; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/Editors/EditorValidatorCollection.cs b/src/Umbraco.Web/Editors/EditorValidatorCollection.cs index 07c7b0d8b4..89dccc5425 100644 --- a/src/Umbraco.Web/Editors/EditorValidatorCollection.cs +++ b/src/Umbraco.Web/Editors/EditorValidatorCollection.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Web.Editors { diff --git a/src/Umbraco.Web/Editors/EditorValidatorCollectionBuilder.cs b/src/Umbraco.Web/Editors/EditorValidatorCollectionBuilder.cs index 0061e39905..e05c85a1b6 100644 --- a/src/Umbraco.Web/Editors/EditorValidatorCollectionBuilder.cs +++ b/src/Umbraco.Web/Editors/EditorValidatorCollectionBuilder.cs @@ -1,5 +1,5 @@ using LightInject; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Web.Editors { diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckCollection.cs b/src/Umbraco.Web/HealthCheck/HealthCheckCollection.cs index a65d8199b4..71777e37ee 100644 --- a/src/Umbraco.Web/HealthCheck/HealthCheckCollection.cs +++ b/src/Umbraco.Web/HealthCheck/HealthCheckCollection.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Web.HealthCheck { diff --git a/src/Umbraco.Web/HealthCheck/HeathCheckCollectionBuilder.cs b/src/Umbraco.Web/HealthCheck/HeathCheckCollectionBuilder.cs index dfd7b39b9f..9528f9a9dd 100644 --- a/src/Umbraco.Web/HealthCheck/HeathCheckCollectionBuilder.cs +++ b/src/Umbraco.Web/HealthCheck/HeathCheckCollectionBuilder.cs @@ -1,5 +1,5 @@ using LightInject; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Web.HealthCheck { diff --git a/src/Umbraco.Web/Media/ImageUrlProviderCollection.cs b/src/Umbraco.Web/Media/ImageUrlProviderCollection.cs index 8c71fcd434..38205462c1 100644 --- a/src/Umbraco.Web/Media/ImageUrlProviderCollection.cs +++ b/src/Umbraco.Web/Media/ImageUrlProviderCollection.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Media; using Umbraco.Web.Media.ImageUrlProviders; diff --git a/src/Umbraco.Web/Media/ImageUrlProviderCollectionBuilder.cs b/src/Umbraco.Web/Media/ImageUrlProviderCollectionBuilder.cs index a1e68e3608..79fb489e40 100644 --- a/src/Umbraco.Web/Media/ImageUrlProviderCollectionBuilder.cs +++ b/src/Umbraco.Web/Media/ImageUrlProviderCollectionBuilder.cs @@ -1,5 +1,5 @@ using LightInject; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Media; namespace Umbraco.Web.Media diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs b/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs index 5431324008..3a623ac3e1 100644 --- a/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs +++ b/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.IO; namespace Umbraco.Web.Media.ThumbnailProviders diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs b/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs index b00b3987d1..b09e411d32 100644 --- a/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs +++ b/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Text; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.IO; namespace Umbraco.Web.Media.ThumbnailProviders diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs b/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs index b0c3f68aa9..769a73bee6 100644 --- a/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs +++ b/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.IO; namespace Umbraco.Web.Media.ThumbnailProviders diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProviderCollection.cs b/src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProviderCollection.cs index 9cbf8f5c7f..1668677649 100644 --- a/src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProviderCollection.cs +++ b/src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProviderCollection.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Media; namespace Umbraco.Web.Media.ThumbnailProviders diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProviderCollectionBuilder.cs b/src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProviderCollectionBuilder.cs index e6f03c01e4..e5925ac4e7 100644 --- a/src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProviderCollectionBuilder.cs +++ b/src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProviderCollectionBuilder.cs @@ -1,5 +1,5 @@ using LightInject; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Media; namespace Umbraco.Web.Media.ThumbnailProviders diff --git a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs index 987637976b..86aac6413d 100644 --- a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs +++ b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs @@ -73,7 +73,7 @@ namespace Umbraco.Web.Mvc protected UmbracoContext UmbracoContext => _umbracoContext ?? (_umbracoContext = UmbracoContext.Current); // todo - try lazy property injection? - private FacadeRouter FacadeRouter => Core.DI.Current.Container.GetInstance(); + private FacadeRouter FacadeRouter => Core.Composing.Current.Container.GetInstance(); /// /// Exposes an UmbracoHelper diff --git a/src/Umbraco.Web/Mvc/FilteredControllerFactoryCollection.cs b/src/Umbraco.Web/Mvc/FilteredControllerFactoryCollection.cs index e30fca2674..62c7ec7cd0 100644 --- a/src/Umbraco.Web/Mvc/FilteredControllerFactoryCollection.cs +++ b/src/Umbraco.Web/Mvc/FilteredControllerFactoryCollection.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Web.Mvc { diff --git a/src/Umbraco.Web/Mvc/FilteredControllerFactoryCollectionBuilder.cs b/src/Umbraco.Web/Mvc/FilteredControllerFactoryCollectionBuilder.cs index 96f61f767c..47d4d5ee51 100644 --- a/src/Umbraco.Web/Mvc/FilteredControllerFactoryCollectionBuilder.cs +++ b/src/Umbraco.Web/Mvc/FilteredControllerFactoryCollectionBuilder.cs @@ -1,5 +1,5 @@ using LightInject; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Web.Mvc { diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs index 3095e406f0..4dc3aae055 100644 --- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs +++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs @@ -396,7 +396,7 @@ namespace Umbraco.Web.Mvc if (request.HasTemplate == false && routeDef.HasHijackedRoute == false) { // fixme - better find a way to inject that engine? or at least Current.Engine of some sort! - var engine = Core.DI.Current.Container.GetInstance(); + var engine = Core.Composing.Current.Container.GetInstance(); request.UpdateOnMissingTemplate(); // request will go 404 // HandleHttpResponseStatus returns a value indicating that the request should diff --git a/src/Umbraco.Web/Mvc/SurfaceControllerTypeCollection.cs b/src/Umbraco.Web/Mvc/SurfaceControllerTypeCollection.cs index e8651e2007..dfa69825ad 100644 --- a/src/Umbraco.Web/Mvc/SurfaceControllerTypeCollection.cs +++ b/src/Umbraco.Web/Mvc/SurfaceControllerTypeCollection.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Web.Mvc { diff --git a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs index cd5fe66189..a3d3b79d6e 100644 --- a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs +++ b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs @@ -11,7 +11,7 @@ namespace Umbraco.Web.Mvc public abstract class UmbracoVirtualNodeRouteHandler : IRouteHandler { // todo - try lazy property injection? - private FacadeRouter FacadeRouter => Core.DI.Current.Container.GetInstance(); + private FacadeRouter FacadeRouter => Core.Composing.Current.Container.GetInstance(); /// /// Returns the UmbracoContext for this route handler diff --git a/src/Umbraco.Web/Routing/ContentFinderCollection.cs b/src/Umbraco.Web/Routing/ContentFinderCollection.cs index 71520b2540..9eca0d5d72 100644 --- a/src/Umbraco.Web/Routing/ContentFinderCollection.cs +++ b/src/Umbraco.Web/Routing/ContentFinderCollection.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Web.Routing { diff --git a/src/Umbraco.Web/Routing/ContentFinderCollectionBuilder.cs b/src/Umbraco.Web/Routing/ContentFinderCollectionBuilder.cs index 88f57ef2e1..7d9ef952c4 100644 --- a/src/Umbraco.Web/Routing/ContentFinderCollectionBuilder.cs +++ b/src/Umbraco.Web/Routing/ContentFinderCollectionBuilder.cs @@ -1,5 +1,5 @@ using LightInject; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Web.Routing { diff --git a/src/Umbraco.Web/Routing/UrlProviderCollection.cs b/src/Umbraco.Web/Routing/UrlProviderCollection.cs index 60df7fac7c..a9c1ddaf06 100644 --- a/src/Umbraco.Web/Routing/UrlProviderCollection.cs +++ b/src/Umbraco.Web/Routing/UrlProviderCollection.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Web.Routing { diff --git a/src/Umbraco.Web/Routing/UrlProviderCollectionBuilder.cs b/src/Umbraco.Web/Routing/UrlProviderCollectionBuilder.cs index cdd0ec7995..c0357dbc8e 100644 --- a/src/Umbraco.Web/Routing/UrlProviderCollectionBuilder.cs +++ b/src/Umbraco.Web/Routing/UrlProviderCollectionBuilder.cs @@ -1,5 +1,5 @@ using LightInject; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Web.Routing { diff --git a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs index 51ef20624d..6f3a950017 100644 --- a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs +++ b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs @@ -73,7 +73,7 @@ namespace Umbraco.Web.Routing // test for collisions var uri = new Uri(url.TrimEnd('/'), UriKind.RelativeOrAbsolute); if (uri.IsAbsoluteUri == false) uri = uri.MakeAbsolute(UmbracoContext.Current.CleanedUmbracoUrl); - var r = Core.DI.Current.Container.GetInstance(); // fixme inject or ? + var r = Core.Composing.Current.Container.GetInstance(); // fixme inject or ? var pcr = r.CreateRequest(UmbracoContext.Current, uri); r.TryRouteRequest(pcr); diff --git a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs index 16e84d2c51..a95d0a2ae7 100644 --- a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs +++ b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs @@ -72,7 +72,7 @@ namespace Umbraco.Web.Scheduling public static MainDomHook Create(Action install, Action release) { - return new MainDomHook(Core.DI.Current.Container.GetInstance(), install, release); + return new MainDomHook(Core.Composing.Current.Container.GetInstance(), install, release); } public static MainDomHook CreateForTest(Action install, Action release) diff --git a/src/Umbraco.Web/Strategies/Migrations/PostMigrationCollection.cs b/src/Umbraco.Web/Strategies/Migrations/PostMigrationCollection.cs index 948024b8aa..c17e8f84e3 100644 --- a/src/Umbraco.Web/Strategies/Migrations/PostMigrationCollection.cs +++ b/src/Umbraco.Web/Strategies/Migrations/PostMigrationCollection.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Web.Strategies.Migrations { diff --git a/src/Umbraco.Web/Strategies/Migrations/PostMigrationCollectionBuilder.cs b/src/Umbraco.Web/Strategies/Migrations/PostMigrationCollectionBuilder.cs index f6d775ed0a..fef5bd338b 100644 --- a/src/Umbraco.Web/Strategies/Migrations/PostMigrationCollectionBuilder.cs +++ b/src/Umbraco.Web/Strategies/Migrations/PostMigrationCollectionBuilder.cs @@ -1,5 +1,5 @@ using LightInject; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Web.Strategies.Migrations { diff --git a/src/Umbraco.Web/Strategies/Migrations/PostMigrationComponent.cs b/src/Umbraco.Web/Strategies/Migrations/PostMigrationComponent.cs index 68bb3b1e91..7e9d8402e6 100644 --- a/src/Umbraco.Web/Strategies/Migrations/PostMigrationComponent.cs +++ b/src/Umbraco.Web/Strategies/Migrations/PostMigrationComponent.cs @@ -1,5 +1,5 @@ using Umbraco.Core.Components; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Persistence.Migrations; using Umbraco.Core.Plugins; using LightInject; diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs index 5378e4bd63..3ee32ec7fa 100644 --- a/src/Umbraco.Web/Templates/TemplateRenderer.cs +++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs @@ -41,7 +41,7 @@ namespace Umbraco.Web.Templates } // todo - inject! - private FacadeRouter FacadeRouter => Core.DI.Current.Container.GetInstance(); + private FacadeRouter FacadeRouter => Core.Composing.Current.Container.GetInstance(); /// diff --git a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs index 58f36ff103..c29185cd88 100644 --- a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs +++ b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs @@ -28,7 +28,7 @@ namespace Umbraco.Web app.SanitizeThreadCulture(); // there's nothing we can do really - if (Core.DI.Current.RuntimeState.Level == RuntimeLevel.BootFailed) + if (Core.Composing.Current.RuntimeState.Level == RuntimeLevel.BootFailed) return; ConfigureServices(app, Current.Services); diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs index b8554c839d..392f335e07 100644 --- a/src/Umbraco.Web/UmbracoModule.cs +++ b/src/Umbraco.Web/UmbracoModule.cs @@ -500,7 +500,7 @@ namespace Umbraco.Web /// public void Init(HttpApplication app) { - if (Core.DI.Current.RuntimeState.Level == RuntimeLevel.BootFailed) + if (Core.Composing.Current.RuntimeState.Level == RuntimeLevel.BootFailed) { // there's nothing we can do really app.BeginRequest += (sender, args) => throw new BootFailedException("Boot failed. Umbraco cannot run. Umbraco's log file contains details about what caused the boot to fail."); @@ -509,7 +509,7 @@ namespace Umbraco.Web // modules are *not* instanciated by the container so we have to // get our dependencies injected manually, through properties. - Core.DI.Current.Container.InjectProperties(this); + Core.Composing.Current.Container.InjectProperties(this); app.BeginRequest += (sender, e) => { diff --git a/src/Umbraco.Web/WebApi/UmbracoApiControllerTypeCollection.cs b/src/Umbraco.Web/WebApi/UmbracoApiControllerTypeCollection.cs index dcb2f7df63..c5c7f9dd2a 100644 --- a/src/Umbraco.Web/WebApi/UmbracoApiControllerTypeCollection.cs +++ b/src/Umbraco.Web/WebApi/UmbracoApiControllerTypeCollection.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace Umbraco.Web.WebApi { diff --git a/src/Umbraco.Web/WebRuntime.cs b/src/Umbraco.Web/WebRuntime.cs index b4e33d3928..b2fcb88d49 100644 --- a/src/Umbraco.Web/WebRuntime.cs +++ b/src/Umbraco.Web/WebRuntime.cs @@ -5,7 +5,7 @@ using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Cache; using Umbraco.Core.Configuration; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Persistence; namespace Umbraco.Web diff --git a/src/Umbraco.Web/WebRuntimeComponent.cs b/src/Umbraco.Web/WebRuntimeComponent.cs index 9400e639c6..a320f2a186 100644 --- a/src/Umbraco.Web/WebRuntimeComponent.cs +++ b/src/Umbraco.Web/WebRuntimeComponent.cs @@ -15,7 +15,7 @@ using Microsoft.AspNet.SignalR; using Umbraco.Core; using Umbraco.Core.Components; using Umbraco.Core.Configuration; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Dictionary; using Umbraco.Core.Events; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs b/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs index aa568cb471..bfe2c8ab86 100644 --- a/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using LightInject; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Plugins; using Umbraco.Web.UI.Pages; diff --git a/src/UmbracoExamine/BaseUmbracoIndexer.cs b/src/UmbracoExamine/BaseUmbracoIndexer.cs index 4abf55bff1..3f5a9bc22e 100644 --- a/src/UmbracoExamine/BaseUmbracoIndexer.cs +++ b/src/UmbracoExamine/BaseUmbracoIndexer.cs @@ -18,7 +18,7 @@ using Examine.LuceneEngine.Faceting; using Examine.LuceneEngine.Indexing; using Lucene.Net.Documents; using Lucene.Net.Store; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Xml; using UmbracoExamine.LocalStorage; diff --git a/src/UmbracoExamine/LocalStorage/LocalTempStorageIndexer.cs b/src/UmbracoExamine/LocalStorage/LocalTempStorageIndexer.cs index 689a0bc556..f33d2b9278 100644 --- a/src/UmbracoExamine/LocalStorage/LocalTempStorageIndexer.cs +++ b/src/UmbracoExamine/LocalStorage/LocalTempStorageIndexer.cs @@ -10,7 +10,7 @@ using Lucene.Net.Analysis; using Lucene.Net.Index; using Lucene.Net.Store; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Directory = System.IO.Directory; diff --git a/src/UmbracoExamine/UmbracoContentIndexer.cs b/src/UmbracoExamine/UmbracoContentIndexer.cs index beb87a481b..7cea5f8dc7 100644 --- a/src/UmbracoExamine/UmbracoContentIndexer.cs +++ b/src/UmbracoExamine/UmbracoContentIndexer.cs @@ -13,7 +13,7 @@ using Examine.LuceneEngine.Indexing; using Examine.LuceneEngine.Providers; using Lucene.Net.Analysis; using Lucene.Net.Store; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseModelDefinitions; diff --git a/src/UmbracoExamine/UmbracoExamineSearcher.cs b/src/UmbracoExamine/UmbracoExamineSearcher.cs index 477b9b4947..606303e8d6 100644 --- a/src/UmbracoExamine/UmbracoExamineSearcher.cs +++ b/src/UmbracoExamine/UmbracoExamineSearcher.cs @@ -16,7 +16,7 @@ using Examine.LuceneEngine; using Examine.LuceneEngine.Providers; using Examine.LuceneEngine.SearchCriteria; using Lucene.Net.Analysis; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using UmbracoExamine.LocalStorage; using Directory = Lucene.Net.Store.Directory; diff --git a/src/UmbracoExamine/UmbracoMemberIndexer.cs b/src/UmbracoExamine/UmbracoMemberIndexer.cs index 6c0c9a86d8..d1f475b2cc 100644 --- a/src/UmbracoExamine/UmbracoMemberIndexer.cs +++ b/src/UmbracoExamine/UmbracoMemberIndexer.cs @@ -13,7 +13,7 @@ using Examine; using System.IO; using Examine.LuceneEngine.Providers; using Lucene.Net.Analysis; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; using Umbraco.Core.Scoping; diff --git a/src/umbraco.cms/businesslogic/CMSNode.cs b/src/umbraco.cms/businesslogic/CMSNode.cs index fe0cfd0dd8..af48dd4d31 100644 --- a/src/umbraco.cms/businesslogic/CMSNode.cs +++ b/src/umbraco.cms/businesslogic/CMSNode.cs @@ -16,7 +16,7 @@ using System.ComponentModel; using Umbraco.Core.IO; using System.Collections; using umbraco.cms.businesslogic.task; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; using File = System.IO.File; diff --git a/src/umbraco.cms/businesslogic/Content.cs b/src/umbraco.cms/businesslogic/Content.cs index 828f347c69..768243795d 100644 --- a/src/umbraco.cms/businesslogic/Content.cs +++ b/src/umbraco.cms/businesslogic/Content.cs @@ -10,7 +10,7 @@ using Umbraco.Core.Models.EntityBase; using umbraco.DataLayer; using System.Runtime.CompilerServices; using umbraco.BusinessLogic; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Events; using Umbraco.Core.Persistence; using Umbraco.Core.Media; diff --git a/src/umbraco.cms/businesslogic/ContentType.cs b/src/umbraco.cms/businesslogic/ContentType.cs index 5fdc094c74..80b217995b 100644 --- a/src/umbraco.cms/businesslogic/ContentType.cs +++ b/src/umbraco.cms/businesslogic/ContentType.cs @@ -12,7 +12,7 @@ using Umbraco.Core.Models.Rdbms; using umbraco.cms.businesslogic.propertytype; using umbraco.cms.businesslogic.web; using umbraco.DataLayer; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Language = umbraco.cms.businesslogic.language.Language; using PropertyType = umbraco.cms.businesslogic.propertytype.PropertyType; diff --git a/src/umbraco.cms/businesslogic/LegacySqlHelper.cs b/src/umbraco.cms/businesslogic/LegacySqlHelper.cs index 593334f95a..1ff5518fcc 100644 --- a/src/umbraco.cms/businesslogic/LegacySqlHelper.cs +++ b/src/umbraco.cms/businesslogic/LegacySqlHelper.cs @@ -2,7 +2,7 @@ using System; using System.Configuration; using umbraco.DataLayer; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; namespace umbraco.cms.businesslogic diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs index 9887a26255..ddc63497c8 100644 --- a/src/umbraco.cms/businesslogic/Packager/Installer.cs +++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs @@ -12,7 +12,7 @@ using Umbraco.Core.Logging; using umbraco.cms.businesslogic.web; using System.Diagnostics; using Umbraco.Core.Models; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Events; using Umbraco.Core.Models.Packaging; using Umbraco.Core.Services; diff --git a/src/umbraco.cms/businesslogic/Packager/Package.cs b/src/umbraco.cms/businesslogic/Packager/Package.cs index 6eea161ad9..77fa831621 100644 --- a/src/umbraco.cms/businesslogic/Packager/Package.cs +++ b/src/umbraco.cms/businesslogic/Packager/Package.cs @@ -4,7 +4,7 @@ using System.Runtime.CompilerServices; using umbraco.BusinessLogic; using umbraco.DataLayer; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; namespace umbraco.cms.businesslogic.packager diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs index 9d71c93cc1..207b40c6e7 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs @@ -11,7 +11,7 @@ using Umbraco.Core; using Umbraco.Core.Logging; using umbraco.cms.businesslogic.web; using umbraco.cms.businesslogic.macro; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.IO; using Umbraco.Core.Models; using Umbraco.Core.Services; diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs index 1c0a41a3ee..13388b1b0a 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.IO; using Umbraco.Core.Models; diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs index a607dd3164..e9d75d230b 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs @@ -1,7 +1,7 @@ using System; using System.Xml; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core._Legacy.PackageActions; diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackagerUtility.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackagerUtility.cs index 6b2db7a527..81c286a4e6 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackagerUtility.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackagerUtility.cs @@ -19,7 +19,7 @@ using umbraco.cms.businesslogic.web; using umbraco.cms.businesslogic.macro; using ICSharpCode.SharpZipLib.Zip; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.IO; namespace umbraco.cms.businesslogic.packager diff --git a/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs b/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs index 8c28d4b0a4..145fb7544b 100644 --- a/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs +++ b/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs @@ -7,7 +7,7 @@ using System.IO; using System.Net; using Umbraco.Core; using Umbraco.Core.Configuration; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.IO; using Umbraco.Core.Models; diff --git a/src/umbraco.cms/businesslogic/Packager/data.cs b/src/umbraco.cms/businesslogic/Packager/data.cs index 2e6d12536d..8612e02310 100644 --- a/src/umbraco.cms/businesslogic/Packager/data.cs +++ b/src/umbraco.cms/businesslogic/Packager/data.cs @@ -6,7 +6,7 @@ using System.ComponentModel; using System.IO; using Umbraco.Core; using Umbraco.Core.Configuration; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Xml; diff --git a/src/umbraco.cms/businesslogic/Permission.cs b/src/umbraco.cms/businesslogic/Permission.cs index 0cdc8d73ad..b4eb33673a 100644 --- a/src/umbraco.cms/businesslogic/Permission.cs +++ b/src/umbraco.cms/businesslogic/Permission.cs @@ -3,7 +3,7 @@ using Umbraco.Core; using Umbraco.Core.Events; using umbraco.cms.businesslogic; using System.Collections.Generic; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; using Umbraco.Core.Services; diff --git a/src/umbraco.cms/businesslogic/language/Item.cs b/src/umbraco.cms/businesslogic/language/Item.cs index 8ebd9e682c..afa7659499 100644 --- a/src/umbraco.cms/businesslogic/language/Item.cs +++ b/src/umbraco.cms/businesslogic/language/Item.cs @@ -12,7 +12,7 @@ using Umbraco.Core.Persistence.SqlSyntax; using umbraco.DataLayer; using umbraco.BusinessLogic; using System.Collections.Generic; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Rdbms; namespace umbraco.cms.businesslogic.language diff --git a/src/umbraco.cms/businesslogic/language/Language.cs b/src/umbraco.cms/businesslogic/language/Language.cs index bc0b194ffe..415063bf48 100644 --- a/src/umbraco.cms/businesslogic/language/Language.cs +++ b/src/umbraco.cms/businesslogic/language/Language.cs @@ -12,7 +12,7 @@ using Umbraco.Core.Services; using umbraco.DataLayer; using umbraco.BusinessLogic; using System.Linq; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace umbraco.cms.businesslogic.language { diff --git a/src/umbraco.cms/businesslogic/macro/Macro.cs b/src/umbraco.cms/businesslogic/macro/Macro.cs index bd81b8eacd..baa034c725 100644 --- a/src/umbraco.cms/businesslogic/macro/Macro.cs +++ b/src/umbraco.cms/businesslogic/macro/Macro.cs @@ -12,7 +12,7 @@ using Umbraco.Core.Services; using umbraco.DataLayer; using umbraco.BusinessLogic; using System.Linq; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Xml; namespace umbraco.cms.businesslogic.macro diff --git a/src/umbraco.cms/businesslogic/media/Media.cs b/src/umbraco.cms/businesslogic/media/Media.cs index 1263682afa..ff860475ed 100644 --- a/src/umbraco.cms/businesslogic/media/Media.cs +++ b/src/umbraco.cms/businesslogic/media/Media.cs @@ -9,7 +9,7 @@ using System.Collections; using System.Collections.Generic; using System.Xml; using System.Linq; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; namespace umbraco.cms.businesslogic.media diff --git a/src/umbraco.cms/businesslogic/media/MediaType.cs b/src/umbraco.cms/businesslogic/media/MediaType.cs index d46985a566..9f820f2389 100644 --- a/src/umbraco.cms/businesslogic/media/MediaType.cs +++ b/src/umbraco.cms/businesslogic/media/MediaType.cs @@ -4,7 +4,7 @@ using Umbraco.Core; using Umbraco.Core.Models; using System.Linq; using System.Threading; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; using Umbraco.Core.Security; diff --git a/src/umbraco.cms/businesslogic/member/Member.cs b/src/umbraco.cms/businesslogic/member/Member.cs index 596cc87596..2692ebd477 100644 --- a/src/umbraco.cms/businesslogic/member/Member.cs +++ b/src/umbraco.cms/businesslogic/member/Member.cs @@ -16,7 +16,7 @@ using System.Web.Security; using System.Text; using System.Security.Cryptography; using System.Linq; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; using Umbraco.Core.Security; using Umbraco.Core.Xml; diff --git a/src/umbraco.cms/businesslogic/member/MemberType.cs b/src/umbraco.cms/businesslogic/member/MemberType.cs index 1ff779de80..f08f11456d 100644 --- a/src/umbraco.cms/businesslogic/member/MemberType.cs +++ b/src/umbraco.cms/businesslogic/member/MemberType.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Events; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; diff --git a/src/umbraco.cms/businesslogic/propertytype/propertytype.cs b/src/umbraco.cms/businesslogic/propertytype/propertytype.cs index d28f8f49fe..73ef9cb96d 100644 --- a/src/umbraco.cms/businesslogic/propertytype/propertytype.cs +++ b/src/umbraco.cms/businesslogic/propertytype/propertytype.cs @@ -10,7 +10,7 @@ using Umbraco.Core.Models; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.web; using umbraco.DataLayer; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Language = umbraco.cms.businesslogic.language.Language; namespace umbraco.cms.businesslogic.propertytype diff --git a/src/umbraco.cms/businesslogic/task/Task.cs b/src/umbraco.cms/businesslogic/task/Task.cs index 2dd48e91dc..13fc055923 100644 --- a/src/umbraco.cms/businesslogic/task/Task.cs +++ b/src/umbraco.cms/businesslogic/task/Task.cs @@ -2,7 +2,7 @@ using System; using umbraco.BusinessLogic; using Umbraco.Core; using umbraco.DataLayer; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; namespace umbraco.cms.businesslogic.task diff --git a/src/umbraco.cms/businesslogic/task/TaskType.cs b/src/umbraco.cms/businesslogic/task/TaskType.cs index 057d1d1776..57b2fe1971 100644 --- a/src/umbraco.cms/businesslogic/task/TaskType.cs +++ b/src/umbraco.cms/businesslogic/task/TaskType.cs @@ -8,7 +8,7 @@ using System.Runtime.CompilerServices; using umbraco.BusinessLogic; using Umbraco.Core; using umbraco.DataLayer; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; namespace umbraco.cms.businesslogic.task diff --git a/src/umbraco.cms/businesslogic/template/Template.cs b/src/umbraco.cms/businesslogic/template/Template.cs index 584bef1cbc..135b0f5a56 100644 --- a/src/umbraco.cms/businesslogic/template/Template.cs +++ b/src/umbraco.cms/businesslogic/template/Template.cs @@ -10,7 +10,7 @@ using Umbraco.Core.Services; using System.Text.RegularExpressions; using System.Collections.Generic; using umbraco.cms.businesslogic.web; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; using Umbraco.Core.Xml; diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs index 7cad25673a..648aad4760 100644 --- a/src/umbraco.cms/businesslogic/web/Document.cs +++ b/src/umbraco.cms/businesslogic/web/Document.cs @@ -6,7 +6,7 @@ using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.EntityBase; using umbraco.DataLayer; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; namespace umbraco.cms.businesslogic.web diff --git a/src/umbraco.cms/businesslogic/web/DocumentType.cs b/src/umbraco.cms/businesslogic/web/DocumentType.cs index d325ef7969..3545acd8f1 100644 --- a/src/umbraco.cms/businesslogic/web/DocumentType.cs +++ b/src/umbraco.cms/businesslogic/web/DocumentType.cs @@ -8,7 +8,7 @@ using umbraco.DataLayer; using System.Collections.Generic; using System.Threading; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; using Umbraco.Core.Security; diff --git a/src/umbraco.cms/businesslogic/web/Domain.cs b/src/umbraco.cms/businesslogic/web/Domain.cs index 21176f4e86..e2d17a0529 100644 --- a/src/umbraco.cms/businesslogic/web/Domain.cs +++ b/src/umbraco.cms/businesslogic/web/Domain.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models; using Language = umbraco.cms.businesslogic.language.Language; diff --git a/src/umbraco.cms/businesslogic/web/StyleSheet.cs b/src/umbraco.cms/businesslogic/web/StyleSheet.cs index 6b1e42ec9f..bb254df8f7 100644 --- a/src/umbraco.cms/businesslogic/web/StyleSheet.cs +++ b/src/umbraco.cms/businesslogic/web/StyleSheet.cs @@ -5,7 +5,7 @@ using System.Xml; using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; using Umbraco.Core.Xml; diff --git a/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs b/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs index 0ac81e7b94..d284ba6008 100644 --- a/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs +++ b/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; namespace umbraco.cms.businesslogic.web diff --git a/src/umbraco.controls/ProgressBar.cs b/src/umbraco.controls/ProgressBar.cs index bacca32f1d..1aab7b4aaf 100644 --- a/src/umbraco.controls/ProgressBar.cs +++ b/src/umbraco.controls/ProgressBar.cs @@ -1,6 +1,6 @@ using System; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Services; namespace umbraco.uicontrols diff --git a/src/umbraco.controls/TreePicker/BaseTreePicker.cs b/src/umbraco.controls/TreePicker/BaseTreePicker.cs index 6274df9c86..d3d5a91f79 100644 --- a/src/umbraco.controls/TreePicker/BaseTreePicker.cs +++ b/src/umbraco.controls/TreePicker/BaseTreePicker.cs @@ -6,7 +6,7 @@ using System.Web.UI.WebControls; using System.Web.UI.HtmlControls; using umbraco.cms.businesslogic; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Services; namespace umbraco.uicontrols.TreePicker diff --git a/src/umbraco.controls/TreePicker/SimpleContentPicker.cs b/src/umbraco.controls/TreePicker/SimpleContentPicker.cs index 43c80be3cf..57ad396373 100644 --- a/src/umbraco.controls/TreePicker/SimpleContentPicker.cs +++ b/src/umbraco.controls/TreePicker/SimpleContentPicker.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Services; namespace umbraco.uicontrols.TreePicker diff --git a/src/umbraco.controls/TreePicker/SimpleMediaPicker.cs b/src/umbraco.controls/TreePicker/SimpleMediaPicker.cs index 6a94184885..65d8bb214a 100644 --- a/src/umbraco.controls/TreePicker/SimpleMediaPicker.cs +++ b/src/umbraco.controls/TreePicker/SimpleMediaPicker.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using Umbraco.Core; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Services; namespace umbraco.uicontrols.TreePicker diff --git a/src/umbraco.datalayer/SqlHelper.cs b/src/umbraco.datalayer/SqlHelper.cs index 04ee1aebbf..647b583267 100644 --- a/src/umbraco.datalayer/SqlHelper.cs +++ b/src/umbraco.datalayer/SqlHelper.cs @@ -13,7 +13,7 @@ using System.IO; using System.Reflection; using System.Xml; using umbraco.DataLayer.Utility; -using Umbraco.Core.DI; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; namespace umbraco.DataLayer