diff --git a/src/Umbraco.Core/Components/AuditEventsComponent.cs b/src/Umbraco.Core/Compose/AuditEventsComponent.cs similarity index 99% rename from src/Umbraco.Core/Components/AuditEventsComponent.cs rename to src/Umbraco.Core/Compose/AuditEventsComponent.cs index 08d4702afa..15fdfeacff 100644 --- a/src/Umbraco.Core/Components/AuditEventsComponent.cs +++ b/src/Umbraco.Core/Compose/AuditEventsComponent.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Text; using System.Threading; using System.Web; +using Umbraco.Core.Composing; using Umbraco.Core.Events; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; @@ -10,7 +11,7 @@ using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Compose { public sealed class AuditEventsComponent : IComponent { diff --git a/src/Umbraco.Core/Components/AuditEventsComposer.cs b/src/Umbraco.Core/Compose/AuditEventsComposer.cs similarity index 63% rename from src/Umbraco.Core/Components/AuditEventsComposer.cs rename to src/Umbraco.Core/Compose/AuditEventsComposer.cs index 692cb6c6dd..339d106087 100644 --- a/src/Umbraco.Core/Components/AuditEventsComposer.cs +++ b/src/Umbraco.Core/Compose/AuditEventsComposer.cs @@ -1,4 +1,6 @@ -namespace Umbraco.Core.Components +using Umbraco.Core.Composing; + +namespace Umbraco.Core.Compose { public sealed class AuditEventsComposer : ComponentComposer, ICoreComposer { } diff --git a/src/Umbraco.Core/Components/CompositionExtensions.cs b/src/Umbraco.Core/Compose/CompositionExtensions.cs similarity index 99% rename from src/Umbraco.Core/Components/CompositionExtensions.cs rename to src/Umbraco.Core/Compose/CompositionExtensions.cs index 96d7e7d5c7..4767797dc1 100644 --- a/src/Umbraco.Core/Components/CompositionExtensions.cs +++ b/src/Umbraco.Core/Compose/CompositionExtensions.cs @@ -1,18 +1,17 @@ using System; using Umbraco.Core.Cache; -using Umbraco.Core.Dictionary; using Umbraco.Core.Composing; +using Umbraco.Core.Dictionary; using Umbraco.Core.IO; -using Umbraco.Core.Migrations; +using Umbraco.Core.Logging.Viewer; using Umbraco.Core.Models.PublishedContent; +using Umbraco.Core.PackageActions; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Strings; using Umbraco.Core.Sync; -using Umbraco.Core.Logging.Viewer; -using Umbraco.Core.PackageActions; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Compose { /// /// Provides extension methods to the class. diff --git a/src/Umbraco.Core/Components/ManifestWatcherComponent.cs b/src/Umbraco.Core/Compose/ManifestWatcherComponent.cs similarity index 95% rename from src/Umbraco.Core/Components/ManifestWatcherComponent.cs rename to src/Umbraco.Core/Compose/ManifestWatcherComponent.cs index 2420e1d5bb..4821a1dd94 100644 --- a/src/Umbraco.Core/Components/ManifestWatcherComponent.cs +++ b/src/Umbraco.Core/Compose/ManifestWatcherComponent.cs @@ -1,9 +1,10 @@ using System.IO; +using Umbraco.Core.Composing; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Manifest; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Compose { public sealed class ManifestWatcherComponent : IComponent { diff --git a/src/Umbraco.Core/Components/ManifestWatcherComposer.cs b/src/Umbraco.Core/Compose/ManifestWatcherComposer.cs similarity index 71% rename from src/Umbraco.Core/Components/ManifestWatcherComposer.cs rename to src/Umbraco.Core/Compose/ManifestWatcherComposer.cs index b08680156b..fb37e3dc25 100644 --- a/src/Umbraco.Core/Components/ManifestWatcherComposer.cs +++ b/src/Umbraco.Core/Compose/ManifestWatcherComposer.cs @@ -1,4 +1,6 @@ -namespace Umbraco.Core.Components +using Umbraco.Core.Composing; + +namespace Umbraco.Core.Compose { [RuntimeLevel(MinLevel = RuntimeLevel.Run)] public class ManifestWatcherComposer : ComponentComposer, ICoreComposer diff --git a/src/Umbraco.Core/Components/RelateOnCopyComponent.cs b/src/Umbraco.Core/Compose/RelateOnCopyComponent.cs similarity index 98% rename from src/Umbraco.Core/Components/RelateOnCopyComponent.cs rename to src/Umbraco.Core/Compose/RelateOnCopyComponent.cs index d38406f970..63a7e170da 100644 --- a/src/Umbraco.Core/Components/RelateOnCopyComponent.cs +++ b/src/Umbraco.Core/Compose/RelateOnCopyComponent.cs @@ -3,7 +3,7 @@ using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Compose { // TODO: This should just exist in the content service/repo! public sealed class RelateOnCopyComponent : IComponent diff --git a/src/Umbraco.Core/Components/RelateOnCopyComposer.cs b/src/Umbraco.Core/Compose/RelateOnCopyComposer.cs similarity index 71% rename from src/Umbraco.Core/Components/RelateOnCopyComposer.cs rename to src/Umbraco.Core/Compose/RelateOnCopyComposer.cs index f5e9423edd..3c65b291c6 100644 --- a/src/Umbraco.Core/Components/RelateOnCopyComposer.cs +++ b/src/Umbraco.Core/Compose/RelateOnCopyComposer.cs @@ -1,4 +1,6 @@ -namespace Umbraco.Core.Components +using Umbraco.Core.Composing; + +namespace Umbraco.Core.Compose { [RuntimeLevel(MinLevel = RuntimeLevel.Run)] public sealed class RelateOnCopyComposer : ComponentComposer, ICoreComposer diff --git a/src/Umbraco.Core/Components/RelateOnTrashComponent.cs b/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs similarity index 99% rename from src/Umbraco.Core/Components/RelateOnTrashComponent.cs rename to src/Umbraco.Core/Compose/RelateOnTrashComponent.cs index 6279bb98ba..501907a6e7 100644 --- a/src/Umbraco.Core/Components/RelateOnTrashComponent.cs +++ b/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs @@ -5,7 +5,7 @@ using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Compose { public sealed class RelateOnTrashComponent : IComponent { diff --git a/src/Umbraco.Core/Components/RelateOnTrashComposer.cs b/src/Umbraco.Core/Compose/RelateOnTrashComposer.cs similarity index 71% rename from src/Umbraco.Core/Components/RelateOnTrashComposer.cs rename to src/Umbraco.Core/Compose/RelateOnTrashComposer.cs index 5d89bc0e37..d0e90fba33 100644 --- a/src/Umbraco.Core/Components/RelateOnTrashComposer.cs +++ b/src/Umbraco.Core/Compose/RelateOnTrashComposer.cs @@ -1,4 +1,6 @@ -namespace Umbraco.Core.Components +using Umbraco.Core.Composing; + +namespace Umbraco.Core.Compose { [RuntimeLevel(MinLevel = RuntimeLevel.Run)] public sealed class RelateOnTrashComposer : ComponentComposer, ICoreComposer diff --git a/src/Umbraco.Core/Components/ComponentCollection.cs b/src/Umbraco.Core/Composing/ComponentCollection.cs similarity index 96% rename from src/Umbraco.Core/Components/ComponentCollection.cs rename to src/Umbraco.Core/Composing/ComponentCollection.cs index 4fa81b9760..52d3fa43b9 100644 --- a/src/Umbraco.Core/Components/ComponentCollection.cs +++ b/src/Umbraco.Core/Composing/ComponentCollection.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using System.Linq; -using Umbraco.Core.Composing; using Umbraco.Core.Logging; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Represents the collection of implementations. diff --git a/src/Umbraco.Core/Components/ComponentCollectionBuilder.cs b/src/Umbraco.Core/Composing/ComponentCollectionBuilder.cs similarity index 95% rename from src/Umbraco.Core/Components/ComponentCollectionBuilder.cs rename to src/Umbraco.Core/Composing/ComponentCollectionBuilder.cs index 584de7a8f2..59a272125e 100644 --- a/src/Umbraco.Core/Components/ComponentCollectionBuilder.cs +++ b/src/Umbraco.Core/Composing/ComponentCollectionBuilder.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; -using Umbraco.Core.Composing; using Umbraco.Core.Logging; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Builds a . diff --git a/src/Umbraco.Core/Components/ComponentComposer.cs b/src/Umbraco.Core/Composing/ComponentComposer.cs similarity index 91% rename from src/Umbraco.Core/Components/ComponentComposer.cs rename to src/Umbraco.Core/Composing/ComponentComposer.cs index 792790c42f..b93ec49a89 100644 --- a/src/Umbraco.Core/Components/ComponentComposer.cs +++ b/src/Umbraco.Core/Composing/ComponentComposer.cs @@ -1,4 +1,6 @@ -namespace Umbraco.Core.Components +using Umbraco.Core.Compose; + +namespace Umbraco.Core.Composing { /// /// Provides a base class for composers which compose a component. diff --git a/src/Umbraco.Core/Components/ComposeAfterAttribute.cs b/src/Umbraco.Core/Composing/ComposeAfterAttribute.cs similarity index 98% rename from src/Umbraco.Core/Components/ComposeAfterAttribute.cs rename to src/Umbraco.Core/Composing/ComposeAfterAttribute.cs index a8fdfaa92b..95c39c7094 100644 --- a/src/Umbraco.Core/Components/ComposeAfterAttribute.cs +++ b/src/Umbraco.Core/Composing/ComposeAfterAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Indicates that a composer requires another composer. diff --git a/src/Umbraco.Core/Components/ComposeBeforeAttribute.cs b/src/Umbraco.Core/Composing/ComposeBeforeAttribute.cs similarity index 98% rename from src/Umbraco.Core/Components/ComposeBeforeAttribute.cs rename to src/Umbraco.Core/Composing/ComposeBeforeAttribute.cs index 17065d1676..f88445b0e7 100644 --- a/src/Umbraco.Core/Components/ComposeBeforeAttribute.cs +++ b/src/Umbraco.Core/Composing/ComposeBeforeAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Indicates that a component is required by another composer. diff --git a/src/Umbraco.Core/Components/Composers.cs b/src/Umbraco.Core/Composing/Composers.cs similarity index 99% rename from src/Umbraco.Core/Components/Composers.cs rename to src/Umbraco.Core/Composing/Composers.cs index 4bbbdf26b0..14cb0dce8e 100644 --- a/src/Umbraco.Core/Components/Composers.cs +++ b/src/Umbraco.Core/Composing/Composers.cs @@ -6,7 +6,7 @@ using System.Text; using Umbraco.Core.Collections; using Umbraco.Core.Logging; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { // note: this class is NOT thread-safe in any ways diff --git a/src/Umbraco.Core/Components/Composition.cs b/src/Umbraco.Core/Composing/Composition.cs similarity index 99% rename from src/Umbraco.Core/Components/Composition.cs rename to src/Umbraco.Core/Composing/Composition.cs index 6df86d793f..d7686ccd07 100644 --- a/src/Umbraco.Core/Components/Composition.cs +++ b/src/Umbraco.Core/Composing/Composition.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Represents a composition. diff --git a/src/Umbraco.Core/Composing/Composers/ConfigurationComposer.cs b/src/Umbraco.Core/Composing/CompositionExtensions/Configuration.cs similarity index 75% rename from src/Umbraco.Core/Composing/Composers/ConfigurationComposer.cs rename to src/Umbraco.Core/Composing/CompositionExtensions/Configuration.cs index 7fba47a2cd..78475953b7 100644 --- a/src/Umbraco.Core/Composing/Composers/ConfigurationComposer.cs +++ b/src/Umbraco.Core/Composing/CompositionExtensions/Configuration.cs @@ -1,13 +1,11 @@ -using Umbraco.Core.Components; -using Umbraco.Core.Configuration; -using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Core.Configuration.UmbracoSettings; -namespace Umbraco.Core.Composing.Composers +namespace Umbraco.Core.Composing.CompositionExtensions { /// /// Compose configurations. /// - public static class ConfigurationComposer + public static class Configuration { public static Composition ComposeConfiguration(this Composition composition) { diff --git a/src/Umbraco.Core/Composing/Composers/CoreMappingProfilesComposer.cs b/src/Umbraco.Core/Composing/CompositionExtensions/CoreMappingProfiles.cs similarity index 69% rename from src/Umbraco.Core/Composing/Composers/CoreMappingProfilesComposer.cs rename to src/Umbraco.Core/Composing/CompositionExtensions/CoreMappingProfiles.cs index 0274b8f1a9..ed875ec973 100644 --- a/src/Umbraco.Core/Composing/Composers/CoreMappingProfilesComposer.cs +++ b/src/Umbraco.Core/Composing/CompositionExtensions/CoreMappingProfiles.cs @@ -1,11 +1,10 @@ using AutoMapper; -using Umbraco.Core.Components; using Umbraco.Core.Models.Identity; -namespace Umbraco.Core.Composing.Composers +namespace Umbraco.Core.Composing.CompositionExtensions { - public static class CoreMappingProfilesComposer + public static class CoreMappingProfiles { public static Composition ComposeCoreMappingProfiles(this Composition composition) { diff --git a/src/Umbraco.Core/Composing/Composers/FileSystemsComposer.cs b/src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs similarity index 95% rename from src/Umbraco.Core/Composing/Composers/FileSystemsComposer.cs rename to src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs index 4c598f27e4..76b363f80e 100644 --- a/src/Umbraco.Core/Composing/Composers/FileSystemsComposer.cs +++ b/src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs @@ -1,10 +1,10 @@ -using Umbraco.Core.Components; +using Umbraco.Core.Compose; using Umbraco.Core.IO; using Umbraco.Core.IO.MediaPathSchemes; -namespace Umbraco.Core.Composing.Composers +namespace Umbraco.Core.Composing.CompositionExtensions { - public static class FileSystemsComposer + public static class FileSystems { /* * HOW TO REPLACE THE MEDIA UNDERLYING FILESYSTEM @@ -73,10 +73,10 @@ namespace Umbraco.Core.Composing.Composers // it needs to be registered (not only the interface) because it provides additional // functionality eg for scoping, and is injected in the scope provider - whereas the // interface is really for end-users to get access to filesystems. - composition.RegisterUnique(factory => factory.CreateInstance(factory)); + composition.RegisterUnique(factory => factory.CreateInstance(factory)); // register IFileSystems, which gives access too all filesystems - composition.RegisterUnique(factory => factory.GetInstance()); + composition.RegisterUnique(factory => factory.GetInstance()); // register the scheme for media paths composition.RegisterUnique(); diff --git a/src/Umbraco.Core/Composing/Composers/RepositoriesComposer.cs b/src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs similarity index 95% rename from src/Umbraco.Core/Composing/Composers/RepositoriesComposer.cs rename to src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs index 62b92081c1..03f13f96cb 100644 --- a/src/Umbraco.Core/Composing/Composers/RepositoriesComposer.cs +++ b/src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs @@ -1,13 +1,12 @@ -using Umbraco.Core.Components; -using Umbraco.Core.Persistence.Repositories; +using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; -namespace Umbraco.Core.Composing.Composers +namespace Umbraco.Core.Composing.CompositionExtensions { /// /// Composes repositories. /// - public static class RepositoriesComposer + public static class Repositories { public static Composition ComposeRepositories(this Composition composition) { diff --git a/src/Umbraco.Core/Composing/Composers/ServicesComposer.cs b/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs similarity index 98% rename from src/Umbraco.Core/Composing/Composers/ServicesComposer.cs rename to src/Umbraco.Core/Composing/CompositionExtensions/Services.cs index 1e10585b8e..ead2524d80 100644 --- a/src/Umbraco.Core/Composing/Composers/ServicesComposer.cs +++ b/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs @@ -2,7 +2,6 @@ using System.IO; using System.Linq; using Umbraco.Core.Cache; -using Umbraco.Core.Components; using Umbraco.Core.Events; using Umbraco.Core.IO; using Umbraco.Core.Logging; @@ -10,9 +9,9 @@ using Umbraco.Core.Packaging; using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; -namespace Umbraco.Core.Composing.Composers +namespace Umbraco.Core.Composing.CompositionExtensions { - public static class ServicesComposer + public static class Services { public static Composition ComposeServices(this Composition composition) { diff --git a/src/Umbraco.Core/Components/DisableAttribute.cs b/src/Umbraco.Core/Composing/DisableAttribute.cs similarity index 97% rename from src/Umbraco.Core/Components/DisableAttribute.cs rename to src/Umbraco.Core/Composing/DisableAttribute.cs index 608967d6ae..c2a419f8bc 100644 --- a/src/Umbraco.Core/Components/DisableAttribute.cs +++ b/src/Umbraco.Core/Composing/DisableAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Indicates that a composer should be disabled. diff --git a/src/Umbraco.Core/Components/DisableComposerAttribute.cs b/src/Umbraco.Core/Composing/DisableComposerAttribute.cs similarity index 96% rename from src/Umbraco.Core/Components/DisableComposerAttribute.cs rename to src/Umbraco.Core/Composing/DisableComposerAttribute.cs index 9d90a099df..7adc5673ec 100644 --- a/src/Umbraco.Core/Components/DisableComposerAttribute.cs +++ b/src/Umbraco.Core/Composing/DisableComposerAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Indicates that a composer should be disabled. diff --git a/src/Umbraco.Core/Components/EnableAttribute.cs b/src/Umbraco.Core/Composing/EnableAttribute.cs similarity index 97% rename from src/Umbraco.Core/Components/EnableAttribute.cs rename to src/Umbraco.Core/Composing/EnableAttribute.cs index 2176a4ec23..276a04cbec 100644 --- a/src/Umbraco.Core/Components/EnableAttribute.cs +++ b/src/Umbraco.Core/Composing/EnableAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Indicates that a composer should be enabled. diff --git a/src/Umbraco.Core/Components/EnableComposerAttribute.cs b/src/Umbraco.Core/Composing/EnableComposerAttribute.cs similarity index 97% rename from src/Umbraco.Core/Components/EnableComposerAttribute.cs rename to src/Umbraco.Core/Composing/EnableComposerAttribute.cs index fe57700145..a1bc0a8123 100644 --- a/src/Umbraco.Core/Components/EnableComposerAttribute.cs +++ b/src/Umbraco.Core/Composing/EnableComposerAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Indicates that a composer should be enabled. diff --git a/src/Umbraco.Core/Components/IComponent.cs b/src/Umbraco.Core/Composing/IComponent.cs similarity index 95% rename from src/Umbraco.Core/Components/IComponent.cs rename to src/Umbraco.Core/Composing/IComponent.cs index b1954d821b..dcd0365b12 100644 --- a/src/Umbraco.Core/Components/IComponent.cs +++ b/src/Umbraco.Core/Composing/IComponent.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Represents a component. diff --git a/src/Umbraco.Core/Components/IComposer.cs b/src/Umbraco.Core/Composing/IComposer.cs similarity index 81% rename from src/Umbraco.Core/Components/IComposer.cs rename to src/Umbraco.Core/Composing/IComposer.cs index ce02aa4f13..a7a159d697 100644 --- a/src/Umbraco.Core/Components/IComposer.cs +++ b/src/Umbraco.Core/Composing/IComposer.cs @@ -1,6 +1,4 @@ -using Umbraco.Core.Composing; - -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Represents a composer. diff --git a/src/Umbraco.Core/Components/ICoreComposer.cs b/src/Umbraco.Core/Composing/ICoreComposer.cs similarity index 91% rename from src/Umbraco.Core/Components/ICoreComposer.cs rename to src/Umbraco.Core/Composing/ICoreComposer.cs index 94aa9953a9..ff09f41f6b 100644 --- a/src/Umbraco.Core/Components/ICoreComposer.cs +++ b/src/Umbraco.Core/Composing/ICoreComposer.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Represents a core . diff --git a/src/Umbraco.Core/Components/IRuntimeComposer.cs b/src/Umbraco.Core/Composing/IRuntimeComposer.cs similarity index 88% rename from src/Umbraco.Core/Components/IRuntimeComposer.cs rename to src/Umbraco.Core/Composing/IRuntimeComposer.cs index 4b8253ee6c..2a352dc783 100644 --- a/src/Umbraco.Core/Components/IRuntimeComposer.cs +++ b/src/Umbraco.Core/Composing/IRuntimeComposer.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Represents a runtime . diff --git a/src/Umbraco.Core/Components/IUserComposer.cs b/src/Umbraco.Core/Composing/IUserComposer.cs similarity index 89% rename from src/Umbraco.Core/Components/IUserComposer.cs rename to src/Umbraco.Core/Composing/IUserComposer.cs index 59e0023635..136e69a469 100644 --- a/src/Umbraco.Core/Components/IUserComposer.cs +++ b/src/Umbraco.Core/Composing/IUserComposer.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Represents a user . diff --git a/src/Umbraco.Core/Components/RuntimeLevelAttribute.cs b/src/Umbraco.Core/Composing/RuntimeLevelAttribute.cs similarity index 92% rename from src/Umbraco.Core/Components/RuntimeLevelAttribute.cs rename to src/Umbraco.Core/Composing/RuntimeLevelAttribute.cs index 2c698a671a..5de90ee8e8 100644 --- a/src/Umbraco.Core/Components/RuntimeLevelAttribute.cs +++ b/src/Umbraco.Core/Composing/RuntimeLevelAttribute.cs @@ -1,7 +1,6 @@ using System; -using Umbraco.Core.Composing; -namespace Umbraco.Core.Components +namespace Umbraco.Core.Composing { /// /// Marks a composer to indicate a minimum and/or maximum runtime level for which the composer would compose. diff --git a/src/Umbraco.Core/Composing/CompositionExtensions.cs b/src/Umbraco.Core/CompositionExtensions.cs similarity index 97% rename from src/Umbraco.Core/Composing/CompositionExtensions.cs rename to src/Umbraco.Core/CompositionExtensions.cs index c312259b82..46e8111237 100644 --- a/src/Umbraco.Core/Composing/CompositionExtensions.cs +++ b/src/Umbraco.Core/CompositionExtensions.cs @@ -1,9 +1,9 @@ using Umbraco.Core.Cache; -using Umbraco.Core.Components; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; -namespace Umbraco.Core.Composing +namespace Umbraco.Core { /// /// Provides extension methods to the class. diff --git a/src/Umbraco.Core/Composing/FactoryExtensions.cs b/src/Umbraco.Core/FactoryExtensions.cs similarity index 98% rename from src/Umbraco.Core/Composing/FactoryExtensions.cs rename to src/Umbraco.Core/FactoryExtensions.cs index 8027f2c7a1..8514525417 100644 --- a/src/Umbraco.Core/Composing/FactoryExtensions.cs +++ b/src/Umbraco.Core/FactoryExtensions.cs @@ -1,8 +1,9 @@ using System; using System.Linq; using System.Reflection; +using Umbraco.Core.Composing; -namespace Umbraco.Core.Composing +namespace Umbraco.Core { /// /// Provides extension methods to the class. diff --git a/src/Umbraco.Core/Logging/Viewer/LogViewerComposer.cs b/src/Umbraco.Core/Logging/Viewer/LogViewerComposer.cs index 5ddcb01078..651e3de06e 100644 --- a/src/Umbraco.Core/Logging/Viewer/LogViewerComposer.cs +++ b/src/Umbraco.Core/Logging/Viewer/LogViewerComposer.cs @@ -1,4 +1,5 @@ -using Umbraco.Core.Components; +using Umbraco.Core.Compose; +using Umbraco.Core.Composing; namespace Umbraco.Core.Logging.Viewer { diff --git a/src/Umbraco.Core/Composing/RegisterExtensions.cs b/src/Umbraco.Core/RegisterExtensions.cs similarity index 96% rename from src/Umbraco.Core/Composing/RegisterExtensions.cs rename to src/Umbraco.Core/RegisterExtensions.cs index d1eacc0c0f..69e092878e 100644 --- a/src/Umbraco.Core/Composing/RegisterExtensions.cs +++ b/src/Umbraco.Core/RegisterExtensions.cs @@ -1,4 +1,6 @@ -namespace Umbraco.Core.Composing +using Umbraco.Core.Composing; + +namespace Umbraco.Core { /// /// Provides extension methods to the class. diff --git a/src/Umbraco.Core/Runtime/CoreRuntime.cs b/src/Umbraco.Core/Runtime/CoreRuntime.cs index da71cb1061..813c2e6a18 100644 --- a/src/Umbraco.Core/Runtime/CoreRuntime.cs +++ b/src/Umbraco.Core/Runtime/CoreRuntime.cs @@ -6,7 +6,6 @@ using System.Reflection; using System.Threading; using System.Web; using Umbraco.Core.Cache; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Core.Exceptions; diff --git a/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs b/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs index b9efdd6432..e9842a1ba1 100644 --- a/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs +++ b/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using AutoMapper; -using Umbraco.Core.Components; +using Umbraco.Core.Composing; using Umbraco.Core.IO; namespace Umbraco.Core.Runtime diff --git a/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs b/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs index b4faddb5d0..690ac4d56c 100644 --- a/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs +++ b/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs @@ -1,9 +1,8 @@ using System; using System.Configuration; using Umbraco.Core.Cache; -using Umbraco.Core.Components; using Umbraco.Core.Composing; -using Umbraco.Core.Composing.Composers; +using Umbraco.Core.Composing.CompositionExtensions; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Core/RuntimeOptions.cs b/src/Umbraco.Core/RuntimeOptions.cs index 1f89ee6314..c0bae23446 100644 --- a/src/Umbraco.Core/RuntimeOptions.cs +++ b/src/Umbraco.Core/RuntimeOptions.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Configuration; using System.Runtime.CompilerServices; using Umbraco.Core.Cache; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; diff --git a/src/Umbraco.Core/Composing/TypeLoaderExtensions.cs b/src/Umbraco.Core/TypeLoaderExtensions.cs similarity index 93% rename from src/Umbraco.Core/Composing/TypeLoaderExtensions.cs rename to src/Umbraco.Core/TypeLoaderExtensions.cs index 5d17b0f53c..96028daca6 100644 --- a/src/Umbraco.Core/Composing/TypeLoaderExtensions.cs +++ b/src/Umbraco.Core/TypeLoaderExtensions.cs @@ -1,13 +1,12 @@ using System; using System.Collections.Generic; -using System.Linq; using Umbraco.Core.Cache; +using Umbraco.Core.Composing; using Umbraco.Core.PackageActions; using Umbraco.Core.Persistence.Mappers; -using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.PropertyEditors; -namespace Umbraco.Core.Composing +namespace Umbraco.Core { internal static class TypeLoaderExtensions { diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 08a2c552cb..7f50d6249b 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -112,7 +112,7 @@ - + @@ -157,37 +157,37 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + @@ -205,7 +205,7 @@ - + @@ -290,7 +290,7 @@ - + @@ -1446,9 +1446,9 @@ - - - + + + diff --git a/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs b/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs index 68b666632c..650cc64720 100644 --- a/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs +++ b/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs @@ -5,7 +5,6 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Sync; diff --git a/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs b/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs index e9448bd0fc..014c6b0af5 100644 --- a/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs +++ b/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Threading; using Moq; using NUnit.Framework; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Events; using Umbraco.Core.Models; diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs index 87ec4215ac..2a6739df38 100644 --- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs +++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs @@ -2,6 +2,7 @@ using System.Xml; using Moq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; diff --git a/src/Umbraco.Tests/Components/ComponentTests.cs b/src/Umbraco.Tests/Components/ComponentTests.cs index b35813ce99..30cdae4b9d 100644 --- a/src/Umbraco.Tests/Components/ComponentTests.cs +++ b/src/Umbraco.Tests/Components/ComponentTests.cs @@ -4,7 +4,7 @@ using System.Linq; using Moq; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.Components; +using Umbraco.Core.Compose; using Umbraco.Core.Composing; using Umbraco.Core.IO; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs b/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs index 07699f77ed..ec757e09f0 100644 --- a/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs +++ b/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs @@ -5,7 +5,6 @@ using Moq; using NUnit.Framework; using Umbraco.Core.Composing; using Umbraco.Core; -using Umbraco.Core.Components; using Umbraco.Core.Logging; using Umbraco.Tests.Components; diff --git a/src/Umbraco.Tests/Composing/ContainerConformingTests.cs b/src/Umbraco.Tests/Composing/ContainerConformingTests.cs index 86226b82e7..f5c1ff9bc7 100644 --- a/src/Umbraco.Tests/Composing/ContainerConformingTests.cs +++ b/src/Umbraco.Tests/Composing/ContainerConformingTests.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Composing; namespace Umbraco.Tests.Composing diff --git a/src/Umbraco.Tests/Composing/LazyCollectionBuilderTests.cs b/src/Umbraco.Tests/Composing/LazyCollectionBuilderTests.cs index cbabae1a83..3996eba89f 100644 --- a/src/Umbraco.Tests/Composing/LazyCollectionBuilderTests.cs +++ b/src/Umbraco.Tests/Composing/LazyCollectionBuilderTests.cs @@ -5,7 +5,6 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs b/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs index fe8ca7dadc..07db4be3d3 100644 --- a/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs +++ b/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs @@ -5,7 +5,6 @@ using System.Xml.Linq; using Moq; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.PackageActions; diff --git a/src/Umbraco.Tests/IO/FileSystemsTests.cs b/src/Umbraco.Tests/IO/FileSystemsTests.cs index 1f98fd4443..8c70de883f 100644 --- a/src/Umbraco.Tests/IO/FileSystemsTests.cs +++ b/src/Umbraco.Tests/IO/FileSystemsTests.cs @@ -4,16 +4,16 @@ using System.Text; using Moq; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.Components; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Composing; -using Umbraco.Core.Composing.Composers; using Umbraco.Core.IO; using Umbraco.Core.IO.MediaPathSchemes; using Umbraco.Core.Logging; using Umbraco.Core.Services; using Umbraco.Tests.Components; using Umbraco.Tests.TestHelpers; +using Umbraco.Core.Composing.CompositionExtensions; +using FileSystems = Umbraco.Core.IO.FileSystems; namespace Umbraco.Tests.IO { diff --git a/src/Umbraco.Tests/Models/ContentExtensionsTests.cs b/src/Umbraco.Tests/Models/ContentExtensionsTests.cs index efa464a46c..42d7f0e01b 100644 --- a/src/Umbraco.Tests/Models/ContentExtensionsTests.cs +++ b/src/Umbraco.Tests/Models/ContentExtensionsTests.cs @@ -3,8 +3,7 @@ using System.Linq; using Moq; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.Composing; -using Umbraco.Core.Composing.Composers; +using Umbraco.Core.Composing.CompositionExtensions; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Logging; using Umbraco.Core.Models; diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs index 693f919b7a..05f726893e 100644 --- a/src/Umbraco.Tests/Models/ContentTests.cs +++ b/src/Umbraco.Tests/Models/ContentTests.cs @@ -8,8 +8,7 @@ using Moq; using Umbraco.Core; using NUnit.Framework; using Umbraco.Core.Cache; -using Umbraco.Core.Composing; -using Umbraco.Core.Composing.Composers; +using Umbraco.Core.Composing.CompositionExtensions; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Logging; using Umbraco.Core.Models; diff --git a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs index 1817414f69..7ebdfabbb0 100644 --- a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs +++ b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs @@ -4,8 +4,7 @@ using AutoMapper; using Moq; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.Composing; -using Umbraco.Core.Composing.Composers; +using Umbraco.Core.Composing.CompositionExtensions; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Services; using Umbraco.Core.Dictionary; diff --git a/src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs b/src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs index ba71caad95..51df7d1f2f 100644 --- a/src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs +++ b/src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs @@ -5,7 +5,6 @@ using System.Xml.Linq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Composing; -using Umbraco.Core.Composing.Composers; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Models.Packaging; @@ -16,6 +15,7 @@ using Umbraco.Core.Services; using Umbraco.Tests.Services; using Umbraco.Tests.Services.Importing; using Umbraco.Tests.Testing; +using Umbraco.Core.Composing.CompositionExtensions; namespace Umbraco.Tests.Packaging { diff --git a/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs b/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs index 731ce73d3d..abf61370a8 100644 --- a/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs +++ b/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using Moq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.IO; using Umbraco.Core.Models; diff --git a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs index c55da764e2..8d2ab84d35 100644 --- a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs +++ b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs @@ -6,7 +6,6 @@ using NUnit.Framework; using Newtonsoft.Json.Linq; using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; diff --git a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs index ea5fbcaa06..764f6ac4a4 100644 --- a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs +++ b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs @@ -3,7 +3,6 @@ using System.Threading; using Moq; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Models; diff --git a/src/Umbraco.Tests/Published/ConvertersTests.cs b/src/Umbraco.Tests/Published/ConvertersTests.cs index eb0f1a9368..0fce8ebfc3 100644 --- a/src/Umbraco.Tests/Published/ConvertersTests.cs +++ b/src/Umbraco.Tests/Published/ConvertersTests.cs @@ -5,7 +5,6 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs index e293653c37..7a9a882baa 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Web.Routing; using Moq; +using Umbraco.Core; using Umbraco.Core.Models.PublishedContent; using Umbraco.Web; using Umbraco.Web.PublishedCache; diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs index c40b2e5876..5efd8668d5 100644 --- a/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs +++ b/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs @@ -1,5 +1,6 @@ using Moq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Tests.TestHelpers; diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs index dfbe9b0cda..ac2e62b1ef 100644 --- a/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs +++ b/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs @@ -1,5 +1,6 @@ using Moq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Core.Models; diff --git a/src/Umbraco.Tests/Routing/UrlRoutesTests.cs b/src/Umbraco.Tests/Routing/UrlRoutesTests.cs index a794e226f1..2e944211ca 100644 --- a/src/Umbraco.Tests/Routing/UrlRoutesTests.cs +++ b/src/Umbraco.Tests/Routing/UrlRoutesTests.cs @@ -1,6 +1,7 @@ using System; using Moq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Core.Models; diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs index ee3bca42e9..5850153100 100644 --- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs +++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs @@ -6,7 +6,7 @@ using Examine; using Moq; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.Components; +using Umbraco.Core.Compose; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Core.Events; diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs index 49bc8149a9..995e1c75a9 100644 --- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs +++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs @@ -11,7 +11,6 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Core.IO; diff --git a/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs b/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs index 4aa28b5975..001553a8ae 100644 --- a/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs @@ -3,7 +3,6 @@ using System.Linq; using Moq; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.Components; using Umbraco.Core.Events; using Umbraco.Core.Models; using Umbraco.Core.IO; diff --git a/src/Umbraco.Tests/Scoping/ScopeFileSystemsTests.cs b/src/Umbraco.Tests/Scoping/ScopeFileSystemsTests.cs index 0a23e4a1b9..b9d680780e 100644 --- a/src/Umbraco.Tests/Scoping/ScopeFileSystemsTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopeFileSystemsTests.cs @@ -4,10 +4,11 @@ using System.Text; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Composing; -using Umbraco.Core.Composing.Composers; using Umbraco.Core.IO; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; +using Umbraco.Core.Composing.CompositionExtensions; +using FileSystems = Umbraco.Core.IO.FileSystems; namespace Umbraco.Tests.Scoping { diff --git a/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs b/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs index b85a79f326..9134e9f51b 100644 --- a/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs @@ -11,6 +11,7 @@ using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; using Umbraco.Web.Cache; using Moq; +using Umbraco.Core; using Umbraco.Core.Events; using Umbraco.Core.Logging; using Umbraco.Core.Sync; diff --git a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs index 1d07ec074f..ad8b8e19a6 100644 --- a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Xml; using Moq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing; using Umbraco.Core.Configuration.UmbracoSettings; diff --git a/src/Umbraco.Tests/Services/EntityXmlSerializerTests.cs b/src/Umbraco.Tests/Services/EntityXmlSerializerTests.cs index 28c69344b7..972595f2f1 100644 --- a/src/Umbraco.Tests/Services/EntityXmlSerializerTests.cs +++ b/src/Umbraco.Tests/Services/EntityXmlSerializerTests.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.Linq; using System.Xml.Linq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Core.Services; diff --git a/src/Umbraco.Tests/Services/SectionServiceTests.cs b/src/Umbraco.Tests/Services/SectionServiceTests.cs index d6bf26184b..cf0471a947 100644 --- a/src/Umbraco.Tests/Services/SectionServiceTests.cs +++ b/src/Umbraco.Tests/Services/SectionServiceTests.cs @@ -1,6 +1,7 @@ using NUnit.Framework; using System.Linq; using System.Threading; +using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs index 35fcc853d4..2e1aadc9bb 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs @@ -3,7 +3,6 @@ using NPoco; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Core.Components; using Umbraco.Core.Logging; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs index a868245940..dc41c64444 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using System.Linq; using System.Reflection; using AutoMapper; using Examine; @@ -8,9 +7,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Core.Components; using Umbraco.Core.Composing; -using Umbraco.Core.Composing.Composers; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Events; @@ -26,7 +23,6 @@ using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; using Umbraco.Core.Strings; using Umbraco.Tests.Components; @@ -36,14 +32,14 @@ using Umbraco.Web; using Umbraco.Web.Services; using Umbraco.Tests.Testing.Objects.Accessors; using Umbraco.Web.Actions; -using Umbraco.Web.Composing.Composers; using Umbraco.Web.ContentApps; -using Umbraco.Web.Macros; using Umbraco.Web.PublishedCache; -using Current = Umbraco.Core.Composing.Current; using Umbraco.Web.Routing; -using Umbraco.Web.Templates; using Umbraco.Web.Trees; +using Umbraco.Core.Composing.CompositionExtensions; +using Umbraco.Web.Composing.CompositionExtensions; +using Current = Umbraco.Core.Composing.Current; +using FileSystems = Umbraco.Core.IO.FileSystems; namespace Umbraco.Tests.Testing { diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs index ba6a83adff..9e59422310 100644 --- a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs +++ b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs @@ -14,6 +14,7 @@ using Umbraco.Core.Models; using Newtonsoft.Json; using System.Collections.Generic; using System; +using Umbraco.Core; namespace Umbraco.Tests.UmbracoExamine { diff --git a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs index fc0d771fb8..a45a33ec00 100644 --- a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs +++ b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs @@ -5,6 +5,7 @@ using Examine; using Examine.Search; using NUnit.Framework; using Moq; +using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Services; diff --git a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs index c5c8b5c77d..d1395c6f2e 100644 --- a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs +++ b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs @@ -5,6 +5,7 @@ using System.Web.Mvc; using System.Web.Routing; using Moq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing; using Umbraco.Core.Configuration.UmbracoSettings; diff --git a/src/Umbraco.Web/Cache/DistributedCacheBinderComponent.cs b/src/Umbraco.Web/Cache/DistributedCacheBinderComponent.cs index 94d274731d..31e876892e 100644 --- a/src/Umbraco.Web/Cache/DistributedCacheBinderComponent.cs +++ b/src/Umbraco.Web/Cache/DistributedCacheBinderComponent.cs @@ -1,4 +1,4 @@ -using Umbraco.Core.Components; +using Umbraco.Core.Composing; namespace Umbraco.Web.Cache { diff --git a/src/Umbraco.Web/Cache/DistributedCacheBinderComposer.cs b/src/Umbraco.Web/Cache/DistributedCacheBinderComposer.cs index f0f57a203b..86f70798d7 100644 --- a/src/Umbraco.Web/Cache/DistributedCacheBinderComposer.cs +++ b/src/Umbraco.Web/Cache/DistributedCacheBinderComposer.cs @@ -1,5 +1,4 @@ using Umbraco.Core; -using Umbraco.Core.Components; using Umbraco.Core.Composing; namespace Umbraco.Web.Cache diff --git a/src/Umbraco.Web/Components/BackOfficeUserAuditEventsComponent.cs b/src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComponent.cs similarity index 98% rename from src/Umbraco.Web/Components/BackOfficeUserAuditEventsComponent.cs rename to src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComponent.cs index 545a781a8d..9bb1889b68 100644 --- a/src/Umbraco.Web/Components/BackOfficeUserAuditEventsComponent.cs +++ b/src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComponent.cs @@ -1,11 +1,11 @@ using System; using Umbraco.Core; -using Umbraco.Core.Components; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; using Umbraco.Core.Services; using Umbraco.Web.Security; -namespace Umbraco.Web.Components +namespace Umbraco.Web.Compose { public sealed class BackOfficeUserAuditEventsComponent : IComponent { @@ -19,7 +19,7 @@ namespace Umbraco.Web.Components } public void Initialize() - { + { //BackOfficeUserManager.AccountLocked += ; //BackOfficeUserManager.AccountUnlocked += ; BackOfficeUserManager.ForgotPasswordRequested += OnForgotPasswordRequest; diff --git a/src/Umbraco.Web/Components/BackOfficeUserAuditEventsComposer.cs b/src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComposer.cs similarity index 67% rename from src/Umbraco.Web/Components/BackOfficeUserAuditEventsComposer.cs rename to src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComposer.cs index 8364dc05f4..38065f98ce 100644 --- a/src/Umbraco.Web/Components/BackOfficeUserAuditEventsComposer.cs +++ b/src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComposer.cs @@ -1,6 +1,6 @@ -using Umbraco.Core.Components; +using Umbraco.Core.Composing; -namespace Umbraco.Web.Components +namespace Umbraco.Web.Compose { public sealed class BackOfficeUserAuditEventsComposer : ComponentComposer, ICoreComposer { } diff --git a/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs similarity index 99% rename from src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs rename to src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs index 4ae371502f..086aa9b197 100644 --- a/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs +++ b/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs @@ -1,8 +1,7 @@ using System; using System.Threading; -using Examine; using Umbraco.Core; -using Umbraco.Core.Components; +using Umbraco.Core.Compose; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; @@ -18,7 +17,7 @@ using Umbraco.Web.Scheduling; using Umbraco.Web.Search; using Current = Umbraco.Web.Composing.Current; -namespace Umbraco.Web.Components +namespace Umbraco.Web.Compose { /// /// Ensures that servers are automatically registered in the database, when using the database server registrar. diff --git a/src/Umbraco.Web/Components/NotificationsComponent.cs b/src/Umbraco.Web/Compose/NotificationsComponent.cs similarity index 98% rename from src/Umbraco.Web/Components/NotificationsComponent.cs rename to src/Umbraco.Web/Compose/NotificationsComponent.cs index 4b447598a3..08bcdf345c 100644 --- a/src/Umbraco.Web/Components/NotificationsComponent.cs +++ b/src/Umbraco.Web/Compose/NotificationsComponent.cs @@ -1,20 +1,20 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; using Umbraco.Core; +using Umbraco.Core.Composing; +using Umbraco.Core.Configuration; +using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Logging; -using Umbraco.Core.Components; using Umbraco.Core.Models; using Umbraco.Core.Models.Entities; +using Umbraco.Core.Models.Membership; using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; using Umbraco.Web.Actions; -using Umbraco.Core.Configuration; -using Umbraco.Core.Configuration.UmbracoSettings; -using System.Linq; -using Umbraco.Core.Models.Membership; -using System; -using System.Globalization; -namespace Umbraco.Web.Components +namespace Umbraco.Web.Compose { public sealed class NotificationsComponent : IComponent { diff --git a/src/Umbraco.Web/Components/NotificationsComposer.cs b/src/Umbraco.Web/Compose/NotificationsComposer.cs similarity index 86% rename from src/Umbraco.Web/Components/NotificationsComposer.cs rename to src/Umbraco.Web/Compose/NotificationsComposer.cs index c945facfc6..7b4bebf878 100644 --- a/src/Umbraco.Web/Components/NotificationsComposer.cs +++ b/src/Umbraco.Web/Compose/NotificationsComposer.cs @@ -1,8 +1,7 @@ using Umbraco.Core; -using Umbraco.Core.Components; using Umbraco.Core.Composing; -namespace Umbraco.Web.Components +namespace Umbraco.Web.Compose { [RuntimeLevel(MinLevel = RuntimeLevel.Run)] public sealed class NotificationsComposer : ComponentComposer, ICoreComposer diff --git a/src/Umbraco.Web/Components/PublicAccessComponent.cs b/src/Umbraco.Web/Compose/PublicAccessComponent.cs similarity index 91% rename from src/Umbraco.Web/Components/PublicAccessComponent.cs rename to src/Umbraco.Web/Compose/PublicAccessComponent.cs index e08d42d961..ef7532253b 100644 --- a/src/Umbraco.Web/Components/PublicAccessComponent.cs +++ b/src/Umbraco.Web/Compose/PublicAccessComponent.cs @@ -1,10 +1,10 @@ using Umbraco.Core; -using Umbraco.Core.Components; +using Umbraco.Core.Composing; using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; -using Umbraco.Web.Composing; +using Current = Umbraco.Web.Composing.Current; -namespace Umbraco.Web.Components +namespace Umbraco.Web.Compose { public sealed class PublicAccessComponent : IComponent { diff --git a/src/Umbraco.Web/Components/PublicAccessComposer.cs b/src/Umbraco.Web/Compose/PublicAccessComposer.cs similarity index 82% rename from src/Umbraco.Web/Components/PublicAccessComposer.cs rename to src/Umbraco.Web/Compose/PublicAccessComposer.cs index a4ae98d0e9..49b4978b80 100644 --- a/src/Umbraco.Web/Components/PublicAccessComposer.cs +++ b/src/Umbraco.Web/Compose/PublicAccessComposer.cs @@ -1,7 +1,7 @@ using Umbraco.Core; -using Umbraco.Core.Components; +using Umbraco.Core.Composing; -namespace Umbraco.Web.Components +namespace Umbraco.Web.Compose { /// /// Used to ensure that the public access data file is kept up to date properly diff --git a/src/Umbraco.Web/Composing/Composers/ControllersComposer.cs b/src/Umbraco.Web/Composing/CompositionExtensions/Controllers.cs similarity index 97% rename from src/Umbraco.Web/Composing/Composers/ControllersComposer.cs rename to src/Umbraco.Web/Composing/CompositionExtensions/Controllers.cs index 0aa3c7f8a1..329c93360b 100644 --- a/src/Umbraco.Web/Composing/Composers/ControllersComposer.cs +++ b/src/Umbraco.Web/Composing/CompositionExtensions/Controllers.cs @@ -4,14 +4,13 @@ using System.Linq; using System.Reflection; using System.Web.Http.Controllers; using System.Web.Mvc; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi; -namespace Umbraco.Web.Composing.Composers +namespace Umbraco.Web.Composing.CompositionExtensions { - internal static class ControllersComposer + internal static class Controllers { /// /// Registers Umbraco controllers. diff --git a/src/Umbraco.Web/Composing/Composers/InstallerComposer.cs b/src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs similarity index 88% rename from src/Umbraco.Web/Composing/Composers/InstallerComposer.cs rename to src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs index 4051dc0306..233db9bcb3 100644 --- a/src/Umbraco.Web/Composing/Composers/InstallerComposer.cs +++ b/src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs @@ -1,12 +1,11 @@ -using Umbraco.Core.Components; +using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Web.Install; using Umbraco.Web.Install.InstallSteps; -using Umbraco.Web.Install.Models; -namespace Umbraco.Web.Composing.Composers +namespace Umbraco.Web.Composing.CompositionExtensions { - public static class InstallerComposer + public static class Installer { public static Composition ComposeInstaller(this Composition composition) { diff --git a/src/Umbraco.Web/Composing/Composers/WebMappingProfilesComposer.cs b/src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs similarity index 95% rename from src/Umbraco.Web/Composing/Composers/WebMappingProfilesComposer.cs rename to src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs index 202849a975..b4fce14385 100644 --- a/src/Umbraco.Web/Composing/Composers/WebMappingProfilesComposer.cs +++ b/src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs @@ -1,15 +1,14 @@ using AutoMapper; using Umbraco.Core; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Models.Mapping; using Umbraco.Web.Trees; -namespace Umbraco.Web.Composing.Composers +namespace Umbraco.Web.Composing.CompositionExtensions { - public static class WebMappingProfilesComposer + public static class WebMappingProfiles { public static Composition ComposeWebMappingProfiles(this Composition composition) { diff --git a/src/Umbraco.Web/CompositionExtensions.cs b/src/Umbraco.Web/CompositionExtensions.cs index 4302cdaeee..ff71a99fa9 100644 --- a/src/Umbraco.Web/CompositionExtensions.cs +++ b/src/Umbraco.Web/CompositionExtensions.cs @@ -1,5 +1,5 @@ using System; -using Umbraco.Core.Components; +using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Web.Actions; using Umbraco.Web.ContentApps; diff --git a/src/Umbraco.Web/ContentApps/ContentAppFactoryCollectionBuilder.cs b/src/Umbraco.Web/ContentApps/ContentAppFactoryCollectionBuilder.cs index 2f35e77a7c..170b9169ef 100644 --- a/src/Umbraco.Web/ContentApps/ContentAppFactoryCollectionBuilder.cs +++ b/src/Umbraco.Web/ContentApps/ContentAppFactoryCollectionBuilder.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Manifest; diff --git a/src/Umbraco.Web/Logging/WebProfilerComponent.cs b/src/Umbraco.Web/Logging/WebProfilerComponent.cs index b61bcd372c..2959e12ad7 100755 --- a/src/Umbraco.Web/Logging/WebProfilerComponent.cs +++ b/src/Umbraco.Web/Logging/WebProfilerComponent.cs @@ -1,6 +1,6 @@ using System; using System.Web; -using Umbraco.Core.Components; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; namespace Umbraco.Web.Logging diff --git a/src/Umbraco.Web/Logging/WebProfilerComposer.cs b/src/Umbraco.Web/Logging/WebProfilerComposer.cs index 383d8d1149..5834dd9dd4 100644 --- a/src/Umbraco.Web/Logging/WebProfilerComposer.cs +++ b/src/Umbraco.Web/Logging/WebProfilerComposer.cs @@ -1,4 +1,4 @@ -using Umbraco.Core.Components; +using Umbraco.Core.Composing; namespace Umbraco.Web.Logging { diff --git a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs index 2fc3badb85..3b4148eb56 100644 --- a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs +++ b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs @@ -1,5 +1,5 @@ using System.Linq; -using Umbraco.Core.Components; +using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services.Implement; diff --git a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs index 1a1c218db6..ce0cf2904f 100644 --- a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs +++ b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs @@ -1,5 +1,5 @@ using Umbraco.Core; -using Umbraco.Core.Components; +using Umbraco.Core.Composing; namespace Umbraco.Web.PropertyEditors { diff --git a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComponent.cs b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComponent.cs index 089ff6a8ea..fba133a2aa 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComponent.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComponent.cs @@ -1,4 +1,4 @@ -using Umbraco.Core.Components; +using Umbraco.Core.Composing; namespace Umbraco.Web.PublishedCache.NuCache { diff --git a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs index f4449008f9..72fa39e7e4 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs @@ -1,4 +1,4 @@ -using Umbraco.Core.Components; +using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Web.PublishedCache.NuCache.DataSource; diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs index acbd022f2e..6db90e3190 100644 --- a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs +++ b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Core.Cache; -using Umbraco.Core.Components; +using Umbraco.Core.Composing; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Events; using Umbraco.Core.Models; @@ -10,7 +10,7 @@ using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; using Umbraco.Core.Sync; using Umbraco.Web.Cache; -using Umbraco.Web.Composing; +using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Web.Routing { diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs b/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs index 75ab4ad613..bcafc8d050 100644 --- a/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs +++ b/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs @@ -1,5 +1,5 @@ using Umbraco.Core; -using Umbraco.Core.Components; +using Umbraco.Core.Composing; namespace Umbraco.Web.Routing { diff --git a/src/Umbraco.Web/Runtime/WebRuntime.cs b/src/Umbraco.Web/Runtime/WebRuntime.cs index 0f689378d6..13cd717fd1 100644 --- a/src/Umbraco.Web/Runtime/WebRuntime.cs +++ b/src/Umbraco.Web/Runtime/WebRuntime.cs @@ -1,6 +1,5 @@ using System.Web; using Umbraco.Core.Cache; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs index a7de6ca842..e2bdd7e84d 100644 --- a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs +++ b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs @@ -13,7 +13,6 @@ using System.Web.Routing; using ClientDependency.Core.CompositeFiles.Providers; using ClientDependency.Core.Config; using Umbraco.Core; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs index 6e82177c89..8a0f47dec3 100644 --- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs +++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs @@ -4,7 +4,6 @@ using System.Web.Security; using Examine; using Microsoft.AspNet.SignalR; using Umbraco.Core; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Dashboards; using Umbraco.Core.Dictionary; @@ -18,7 +17,7 @@ using Umbraco.Core.Runtime; using Umbraco.Core.Services; using Umbraco.Web.Actions; using Umbraco.Web.Cache; -using Umbraco.Web.Composing.Composers; +using Umbraco.Web.Composing.CompositionExtensions; using Umbraco.Web.ContentApps; using Umbraco.Web.Dashboards; using Umbraco.Web.Dictionary; diff --git a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs index 697c80e76d..ee1fc3d7bb 100644 --- a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs +++ b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Threading; using Umbraco.Core; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.HealthChecks; diff --git a/src/Umbraco.Web/Scheduling/SchedulerComposer.cs b/src/Umbraco.Web/Scheduling/SchedulerComposer.cs index b28312c8d6..5c56f3d314 100644 --- a/src/Umbraco.Web/Scheduling/SchedulerComposer.cs +++ b/src/Umbraco.Web/Scheduling/SchedulerComposer.cs @@ -1,6 +1,6 @@ using System; using Umbraco.Core; -using Umbraco.Core.Components; +using Umbraco.Core.Composing; namespace Umbraco.Web.Scheduling { diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs index 0db3f0b65e..3583e5b7f9 100644 --- a/src/Umbraco.Web/Search/ExamineComponent.cs +++ b/src/Umbraco.Web/Search/ExamineComponent.cs @@ -6,7 +6,6 @@ using System.Threading; using Examine; using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Core.Components; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Scoping; @@ -19,6 +18,7 @@ using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Web.Scheduling; using System.Threading.Tasks; using Examine.LuceneEngine.Directories; +using Umbraco.Core.Composing; namespace Umbraco.Web.Search { diff --git a/src/Umbraco.Web/Search/ExamineComposer.cs b/src/Umbraco.Web/Search/ExamineComposer.cs index 5a897144f9..6e74f0e89d 100644 --- a/src/Umbraco.Web/Search/ExamineComposer.cs +++ b/src/Umbraco.Web/Search/ExamineComposer.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using Examine; using Umbraco.Core; -using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; diff --git a/src/Umbraco.Web/SignalR/PreviewHubComponent.cs b/src/Umbraco.Web/SignalR/PreviewHubComponent.cs index 328f5a06ed..1d8a10118b 100644 --- a/src/Umbraco.Web/SignalR/PreviewHubComponent.cs +++ b/src/Umbraco.Web/SignalR/PreviewHubComponent.cs @@ -1,7 +1,7 @@ using System; using Microsoft.AspNet.SignalR; using Umbraco.Core.Cache; -using Umbraco.Core.Components; +using Umbraco.Core.Composing; using Umbraco.Core.Sync; using Umbraco.Web.Cache; diff --git a/src/Umbraco.Web/SignalR/PreviewHubComposer.cs b/src/Umbraco.Web/SignalR/PreviewHubComposer.cs index b92c6fe5a4..cef1e166c2 100644 --- a/src/Umbraco.Web/SignalR/PreviewHubComposer.cs +++ b/src/Umbraco.Web/SignalR/PreviewHubComposer.cs @@ -1,6 +1,6 @@ using Microsoft.AspNet.SignalR; using Umbraco.Core; -using Umbraco.Core.Components; +using Umbraco.Core.Composing; namespace Umbraco.Web.SignalR { diff --git a/src/Umbraco.Web/Trees/BackOfficeSectionCollectionBuilder.cs b/src/Umbraco.Web/Trees/BackOfficeSectionCollectionBuilder.cs index 452ac02f38..290e28fab8 100644 --- a/src/Umbraco.Web/Trees/BackOfficeSectionCollectionBuilder.cs +++ b/src/Umbraco.Web/Trees/BackOfficeSectionCollectionBuilder.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Manifest; using Umbraco.Core.Models.Trees; diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index bdea3f1a66..228abb41fd 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -115,12 +115,12 @@ - - - - + + + + - + @@ -333,13 +333,13 @@ - + - + @@ -887,7 +887,7 @@ - + @@ -1044,7 +1044,7 @@ Resources.resx - + @@ -1123,7 +1123,7 @@ - +