From 1f5c47f0297b64f5be8d20d2bf855f4b4cef8f3d Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 30 May 2017 15:56:27 +0200 Subject: [PATCH] Move Plugins to Composing --- src/Umbraco.Compat7/Compat7Component.cs | 2 +- src/Umbraco.Compat7/Core/IApplicationEventHandler.cs | 2 +- src/Umbraco.Core/Cache/DictionaryCacheProvider.cs | 2 +- src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs | 2 +- src/Umbraco.Core/Cache/ICacheRefresher.cs | 2 +- src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs | 2 +- src/Umbraco.Core/Components/IUmbracoComponent.cs | 2 +- src/Umbraco.Core/Composing/Current.cs | 3 +-- .../{Plugins => Composing}/HideFromTypeFinderAttribute.cs | 2 +- src/Umbraco.Core/{Plugins => Composing}/IDiscoverable.cs | 2 +- src/Umbraco.Core/{Plugins => Composing}/TypeFinder.cs | 2 +- src/Umbraco.Core/{Plugins => Composing}/TypeHelper.cs | 2 +- src/Umbraco.Core/{Plugins => Composing}/TypeLoader.cs | 2 +- .../{Plugins => Composing}/TypeLoaderExtensions.cs | 2 +- src/Umbraco.Core/CoreRuntime.cs | 1 - src/Umbraco.Core/CoreRuntimeComponent.cs | 1 - src/Umbraco.Core/Deploy/IServiceConnector.cs | 2 +- src/Umbraco.Core/Events/QueuingEventDispatcherBase.cs | 2 +- src/Umbraco.Core/IO/FileSystems.cs | 2 +- src/Umbraco.Core/Models/DeepCloneHelper.cs | 2 +- src/Umbraco.Core/Models/EntityBase/TracksChangesEntityBase.cs | 2 +- .../Models/PublishedContent/PublishedContentTypeConverter.cs | 2 +- src/Umbraco.Core/ObjectExtensions.cs | 2 +- src/Umbraco.Core/Persistence/Mappers/BaseMapper.cs | 2 +- src/Umbraco.Core/Persistence/Migrations/IMigration.cs | 2 +- .../Persistence/Querying/ExpressionVisitorBase.cs | 2 +- .../Persistence/Querying/ModelToSqlExpressionVisitor.cs | 2 +- src/Umbraco.Core/PropertyEditors/IParameterEditor.cs | 2 +- src/Umbraco.Core/PropertyEditors/IPropertyValueConverter.cs | 2 +- src/Umbraco.Core/PropertyEditors/PreValueEditor.cs | 1 - src/Umbraco.Core/ServiceProviderExtensions.cs | 2 +- src/Umbraco.Core/TypeExtensions.cs | 2 +- src/Umbraco.Core/Udi.cs | 1 - src/Umbraco.Core/_Legacy/PackageActions/IPackageAction.cs | 2 +- .../DependencyInjection/PackageActionCollectionTests.cs | 1 - src/Umbraco.Tests/DependencyInjection/ResolverBaseTest.cs | 1 - .../Models/Mapping/ContentWebModelMappingTests.cs | 1 - src/Umbraco.Tests/Plugins/PluginManagerExtensions.cs | 2 +- src/Umbraco.Tests/Plugins/PluginManagerTests.cs | 2 +- src/Umbraco.Tests/Plugins/TypeFinderTests.cs | 2 +- src/Umbraco.Tests/Plugins/TypeHelperTests.cs | 2 +- .../PublishedContent/PublishedContentMoreTests.cs | 1 - src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs | 1 - src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs | 1 - src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs | 2 +- src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs | 1 - src/Umbraco.Tests/Testing/UmbracoTestBase.cs | 1 - src/Umbraco.Tests/UI/LegacyDialogTests.cs | 2 +- src/Umbraco.Web/Current.cs | 2 +- src/Umbraco.Web/Editors/IEditorValidator.cs | 2 +- .../Checks/DataIntegrity/XmlDataIntegrityHealthCheck.cs | 2 +- src/Umbraco.Web/HealthCheck/HealthCheck.cs | 2 +- src/Umbraco.Web/LightInjectExtensions.cs | 2 +- src/Umbraco.Web/Models/Trees/IApplication.cs | 2 +- src/Umbraco.Web/Mvc/PluginController.cs | 2 +- src/Umbraco.Web/Mvc/PluginControllerArea.cs | 2 +- src/Umbraco.Web/Mvc/RenderRouteHandler.cs | 2 +- src/Umbraco.Web/PluginManagerExtensions.cs | 2 +- .../ValueConverters/ImageCropDataSetTypeConverter.cs | 2 +- src/Umbraco.Web/RelatedLinksTypeConverter.cs | 2 +- .../Security/Identity/AuthenticationOptionsExtensions.cs | 2 +- src/Umbraco.Web/Services/ApplicationTreeService.cs | 2 +- src/Umbraco.Web/Services/SectionService.cs | 2 +- .../Strategies/Migrations/PostMigrationComponent.cs | 1 - src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs | 2 +- src/Umbraco.Web/Trees/LegacyBaseTreeAttribute.cs | 2 +- .../WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs | 2 +- src/Umbraco.Web/WebApi/UmbracoApiController.cs | 2 +- src/Umbraco.Web/WebRuntimeComponent.cs | 1 - src/Umbraco.Web/WebServices/ExamineManagementApiController.cs | 2 +- src/Umbraco.Web/_Legacy/Actions/Action.cs | 4 ++-- src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs | 1 - .../umbraco/Trees/TreeDefinitionCollection.cs | 4 +--- 73 files changed, 59 insertions(+), 77 deletions(-) rename src/Umbraco.Core/{Plugins => Composing}/HideFromTypeFinderAttribute.cs (88%) rename src/Umbraco.Core/{Plugins => Composing}/IDiscoverable.cs (56%) rename src/Umbraco.Core/{Plugins => Composing}/TypeFinder.cs (99%) rename src/Umbraco.Core/{Plugins => Composing}/TypeHelper.cs (99%) rename src/Umbraco.Core/{Plugins => Composing}/TypeLoader.cs (99%) rename src/Umbraco.Core/{Plugins => Composing}/TypeLoaderExtensions.cs (98%) diff --git a/src/Umbraco.Compat7/Compat7Component.cs b/src/Umbraco.Compat7/Compat7Component.cs index edcbd018f2..6fe60ad31b 100644 --- a/src/Umbraco.Compat7/Compat7Component.cs +++ b/src/Umbraco.Compat7/Compat7Component.cs @@ -5,7 +5,7 @@ using System.Linq; using Umbraco.Core; using Umbraco.Core.Components; using Umbraco.Core.Logging; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Compat7 { diff --git a/src/Umbraco.Compat7/Core/IApplicationEventHandler.cs b/src/Umbraco.Compat7/Core/IApplicationEventHandler.cs index a8777acb4b..afc8c36e0d 100644 --- a/src/Umbraco.Compat7/Core/IApplicationEventHandler.cs +++ b/src/Umbraco.Compat7/Core/IApplicationEventHandler.cs @@ -1,6 +1,6 @@ // ReSharper disable once CheckNamespace -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core { diff --git a/src/Umbraco.Core/Cache/DictionaryCacheProvider.cs b/src/Umbraco.Core/Cache/DictionaryCacheProvider.cs index 02e4b08642..5c8a44b404 100644 --- a/src/Umbraco.Core/Cache/DictionaryCacheProvider.cs +++ b/src/Umbraco.Core/Cache/DictionaryCacheProvider.cs @@ -3,7 +3,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.Cache { diff --git a/src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs b/src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs index 1c5528dda1..fedfa9899b 100644 --- a/src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs +++ b/src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.Cache { diff --git a/src/Umbraco.Core/Cache/ICacheRefresher.cs b/src/Umbraco.Core/Cache/ICacheRefresher.cs index eb6474c59d..bab0acf2cf 100644 --- a/src/Umbraco.Core/Cache/ICacheRefresher.cs +++ b/src/Umbraco.Core/Cache/ICacheRefresher.cs @@ -1,5 +1,5 @@ using System; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.Cache { diff --git a/src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs b/src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs index 226cf35933..44d28b1700 100644 --- a/src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs +++ b/src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs @@ -5,7 +5,7 @@ using System.Runtime.Caching; using System.Text.RegularExpressions; using System.Threading; using System.Web.Caching; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using CacheItemPriority = System.Web.Caching.CacheItemPriority; namespace Umbraco.Core.Cache diff --git a/src/Umbraco.Core/Components/IUmbracoComponent.cs b/src/Umbraco.Core/Components/IUmbracoComponent.cs index 736642330b..d25b97c270 100644 --- a/src/Umbraco.Core/Components/IUmbracoComponent.cs +++ b/src/Umbraco.Core/Components/IUmbracoComponent.cs @@ -1,4 +1,4 @@ -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.Components { diff --git a/src/Umbraco.Core/Composing/Current.cs b/src/Umbraco.Core/Composing/Current.cs index 17dafcce4e..ead06fa42c 100644 --- a/src/Umbraco.Core/Composing/Current.cs +++ b/src/Umbraco.Core/Composing/Current.cs @@ -7,7 +7,6 @@ using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Persistence; -using Umbraco.Core.Plugins; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; using Umbraco.Core.Services; @@ -97,7 +96,7 @@ namespace Umbraco.Core.Composing public static IRuntimeState RuntimeState => Container.GetInstance(); - public static TypeLoader TypeLoader + public static TypeLoader TypeLoader => Container.GetInstance(); public static FileSystems FileSystems diff --git a/src/Umbraco.Core/Plugins/HideFromTypeFinderAttribute.cs b/src/Umbraco.Core/Composing/HideFromTypeFinderAttribute.cs similarity index 88% rename from src/Umbraco.Core/Plugins/HideFromTypeFinderAttribute.cs rename to src/Umbraco.Core/Composing/HideFromTypeFinderAttribute.cs index 6654123d6c..ff138563c3 100644 --- a/src/Umbraco.Core/Plugins/HideFromTypeFinderAttribute.cs +++ b/src/Umbraco.Core/Composing/HideFromTypeFinderAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Core.Plugins +namespace Umbraco.Core.Composing { /// /// Notifies the TypeFinder that it should ignore the class marked with this attribute. diff --git a/src/Umbraco.Core/Plugins/IDiscoverable.cs b/src/Umbraco.Core/Composing/IDiscoverable.cs similarity index 56% rename from src/Umbraco.Core/Plugins/IDiscoverable.cs rename to src/Umbraco.Core/Composing/IDiscoverable.cs index ee8bab24b2..c7bbb57a14 100644 --- a/src/Umbraco.Core/Plugins/IDiscoverable.cs +++ b/src/Umbraco.Core/Composing/IDiscoverable.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Core.Plugins +namespace Umbraco.Core.Composing { public interface IDiscoverable { } diff --git a/src/Umbraco.Core/Plugins/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs similarity index 99% rename from src/Umbraco.Core/Plugins/TypeFinder.cs rename to src/Umbraco.Core/Composing/TypeFinder.cs index b7cddafbd2..a84ef2575b 100644 --- a/src/Umbraco.Core/Plugins/TypeFinder.cs +++ b/src/Umbraco.Core/Composing/TypeFinder.cs @@ -10,7 +10,7 @@ using System.Web.Compilation; using Umbraco.Core.Composing; using Umbraco.Core.IO; -namespace Umbraco.Core.Plugins +namespace Umbraco.Core.Composing { /// /// A utility class to find all classes of a certain type by reflection in the current bin folder diff --git a/src/Umbraco.Core/Plugins/TypeHelper.cs b/src/Umbraco.Core/Composing/TypeHelper.cs similarity index 99% rename from src/Umbraco.Core/Plugins/TypeHelper.cs rename to src/Umbraco.Core/Composing/TypeHelper.cs index a8450af1c2..63a6389614 100644 --- a/src/Umbraco.Core/Plugins/TypeHelper.cs +++ b/src/Umbraco.Core/Composing/TypeHelper.cs @@ -6,7 +6,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reflection; -namespace Umbraco.Core.Plugins +namespace Umbraco.Core.Composing { /// /// A utility class for type checking, this provides internal caching so that calls to these methods will be faster diff --git a/src/Umbraco.Core/Plugins/TypeLoader.cs b/src/Umbraco.Core/Composing/TypeLoader.cs similarity index 99% rename from src/Umbraco.Core/Plugins/TypeLoader.cs rename to src/Umbraco.Core/Composing/TypeLoader.cs index 3413a27843..5a82730664 100644 --- a/src/Umbraco.Core/Plugins/TypeLoader.cs +++ b/src/Umbraco.Core/Composing/TypeLoader.cs @@ -11,7 +11,7 @@ using Umbraco.Core.IO; using Umbraco.Core.Logging; using File = System.IO.File; -namespace Umbraco.Core.Plugins +namespace Umbraco.Core.Composing { /// /// Provides methods to find and instanciate types. diff --git a/src/Umbraco.Core/Plugins/TypeLoaderExtensions.cs b/src/Umbraco.Core/Composing/TypeLoaderExtensions.cs similarity index 98% rename from src/Umbraco.Core/Plugins/TypeLoaderExtensions.cs rename to src/Umbraco.Core/Composing/TypeLoaderExtensions.cs index 9a8d4ce830..4f91eff5e9 100644 --- a/src/Umbraco.Core/Plugins/TypeLoaderExtensions.cs +++ b/src/Umbraco.Core/Composing/TypeLoaderExtensions.cs @@ -7,7 +7,7 @@ using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.PropertyEditors; using Umbraco.Core._Legacy.PackageActions; -namespace Umbraco.Core.Plugins +namespace Umbraco.Core.Composing { internal static class TypeLoaderExtensions { diff --git a/src/Umbraco.Core/CoreRuntime.cs b/src/Umbraco.Core/CoreRuntime.cs index ceb3bbc4b4..e6394b219a 100644 --- a/src/Umbraco.Core/CoreRuntime.cs +++ b/src/Umbraco.Core/CoreRuntime.cs @@ -17,7 +17,6 @@ using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.SqlSyntax; -using Umbraco.Core.Plugins; using Umbraco.Core.Scoping; using Umbraco.Core.Services; diff --git a/src/Umbraco.Core/CoreRuntimeComponent.cs b/src/Umbraco.Core/CoreRuntimeComponent.cs index 459009c7e7..cc44f16954 100644 --- a/src/Umbraco.Core/CoreRuntimeComponent.cs +++ b/src/Umbraco.Core/CoreRuntimeComponent.cs @@ -17,7 +17,6 @@ using Umbraco.Core.Models.Mapping; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Migrations; -using Umbraco.Core.Plugins; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; using Umbraco.Core.Services; diff --git a/src/Umbraco.Core/Deploy/IServiceConnector.cs b/src/Umbraco.Core/Deploy/IServiceConnector.cs index b0b76dd854..a0fc274236 100644 --- a/src/Umbraco.Core/Deploy/IServiceConnector.cs +++ b/src/Umbraco.Core/Deploy/IServiceConnector.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.Deploy { diff --git a/src/Umbraco.Core/Events/QueuingEventDispatcherBase.cs b/src/Umbraco.Core/Events/QueuingEventDispatcherBase.cs index 4ccbc3719c..b2680b6cc3 100644 --- a/src/Umbraco.Core/Events/QueuingEventDispatcherBase.cs +++ b/src/Umbraco.Core/Events/QueuingEventDispatcherBase.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using Umbraco.Core.Models.EntityBase; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.Events { diff --git a/src/Umbraco.Core/IO/FileSystems.cs b/src/Umbraco.Core/IO/FileSystems.cs index 6c2448af3a..aa32fd1dc9 100644 --- a/src/Umbraco.Core/IO/FileSystems.cs +++ b/src/Umbraco.Core/IO/FileSystems.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Reflection; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Core.Scoping; namespace Umbraco.Core.IO diff --git a/src/Umbraco.Core/Models/DeepCloneHelper.cs b/src/Umbraco.Core/Models/DeepCloneHelper.cs index 9c0cd1d47f..2e930b1eac 100644 --- a/src/Umbraco.Core/Models/DeepCloneHelper.cs +++ b/src/Umbraco.Core/Models/DeepCloneHelper.cs @@ -4,7 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Reflection; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.Models { diff --git a/src/Umbraco.Core/Models/EntityBase/TracksChangesEntityBase.cs b/src/Umbraco.Core/Models/EntityBase/TracksChangesEntityBase.cs index 71a0883f9e..5432a4982a 100644 --- a/src/Umbraco.Core/Models/EntityBase/TracksChangesEntityBase.cs +++ b/src/Umbraco.Core/Models/EntityBase/TracksChangesEntityBase.cs @@ -5,7 +5,7 @@ using System.ComponentModel; using System.Linq; using System.Reflection; using System.Runtime.Serialization; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.Models.EntityBase { diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeConverter.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeConverter.cs index e0d019b738..c8c331f0d0 100644 --- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeConverter.cs +++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeConverter.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.Globalization; using System.Linq; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.Models.PublishedContent { diff --git a/src/Umbraco.Core/ObjectExtensions.cs b/src/Umbraco.Core/ObjectExtensions.cs index c0517706b8..97936a1936 100644 --- a/src/Umbraco.Core/ObjectExtensions.cs +++ b/src/Umbraco.Core/ObjectExtensions.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Linq.Expressions; using System.Reflection; using System.Xml; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core { diff --git a/src/Umbraco.Core/Persistence/Mappers/BaseMapper.cs b/src/Umbraco.Core/Persistence/Mappers/BaseMapper.cs index e1b8bffd9f..11caf03446 100644 --- a/src/Umbraco.Core/Persistence/Mappers/BaseMapper.cs +++ b/src/Umbraco.Core/Persistence/Mappers/BaseMapper.cs @@ -4,7 +4,7 @@ using System.Linq.Expressions; using System.Reflection; using NPoco; using Umbraco.Core.Persistence.SqlSyntax; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.Persistence.Mappers { diff --git a/src/Umbraco.Core/Persistence/Migrations/IMigration.cs b/src/Umbraco.Core/Persistence/Migrations/IMigration.cs index 0191b7112f..9eb96316f4 100644 --- a/src/Umbraco.Core/Persistence/Migrations/IMigration.cs +++ b/src/Umbraco.Core/Persistence/Migrations/IMigration.cs @@ -1,4 +1,4 @@ -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.Persistence.Migrations { diff --git a/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs b/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs index ee0c53f023..b2815f8b8a 100644 --- a/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs +++ b/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Linq.Expressions; using System.Text; using Umbraco.Core.Persistence.SqlSyntax; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.Persistence.Querying { diff --git a/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs b/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs index b786e201d0..dc27adee6d 100644 --- a/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs +++ b/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs @@ -3,7 +3,7 @@ using System.Linq.Expressions; using Umbraco.Core.Models.EntityBase; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.Persistence.Querying { diff --git a/src/Umbraco.Core/PropertyEditors/IParameterEditor.cs b/src/Umbraco.Core/PropertyEditors/IParameterEditor.cs index e6f9378db7..ce42e5d84e 100644 --- a/src/Umbraco.Core/PropertyEditors/IParameterEditor.cs +++ b/src/Umbraco.Core/PropertyEditors/IParameterEditor.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.PropertyEditors { diff --git a/src/Umbraco.Core/PropertyEditors/IPropertyValueConverter.cs b/src/Umbraco.Core/PropertyEditors/IPropertyValueConverter.cs index 1558ac9b9e..2c5c1eef13 100644 --- a/src/Umbraco.Core/PropertyEditors/IPropertyValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/IPropertyValueConverter.cs @@ -1,6 +1,6 @@ using System; using Umbraco.Core.Models.PublishedContent; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core.PropertyEditors { diff --git a/src/Umbraco.Core/PropertyEditors/PreValueEditor.cs b/src/Umbraco.Core/PropertyEditors/PreValueEditor.cs index 13a6061cb3..100e68c379 100644 --- a/src/Umbraco.Core/PropertyEditors/PreValueEditor.cs +++ b/src/Umbraco.Core/PropertyEditors/PreValueEditor.cs @@ -7,7 +7,6 @@ using Umbraco.Core.Composing; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Models; -using Umbraco.Core.Plugins; namespace Umbraco.Core.PropertyEditors { diff --git a/src/Umbraco.Core/ServiceProviderExtensions.cs b/src/Umbraco.Core/ServiceProviderExtensions.cs index 79ccb5b99b..a453498e0b 100644 --- a/src/Umbraco.Core/ServiceProviderExtensions.cs +++ b/src/Umbraco.Core/ServiceProviderExtensions.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using Umbraco.Core.Logging; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core { diff --git a/src/Umbraco.Core/TypeExtensions.cs b/src/Umbraco.Core/TypeExtensions.cs index 6780982e7c..a7ddcbdb2f 100644 --- a/src/Umbraco.Core/TypeExtensions.cs +++ b/src/Umbraco.Core/TypeExtensions.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; using System.Text; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Core.Strings; namespace Umbraco.Core diff --git a/src/Umbraco.Core/Udi.cs b/src/Umbraco.Core/Udi.cs index 19258f5c17..9a2730ab7a 100644 --- a/src/Umbraco.Core/Udi.cs +++ b/src/Umbraco.Core/Udi.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Reflection; using Umbraco.Core.Deploy; using Umbraco.Core.Composing; -using Umbraco.Core.Plugins; namespace Umbraco.Core { diff --git a/src/Umbraco.Core/_Legacy/PackageActions/IPackageAction.cs b/src/Umbraco.Core/_Legacy/PackageActions/IPackageAction.cs index a9987237b5..502aee36b3 100644 --- a/src/Umbraco.Core/_Legacy/PackageActions/IPackageAction.cs +++ b/src/Umbraco.Core/_Legacy/PackageActions/IPackageAction.cs @@ -1,5 +1,5 @@ using System.Xml; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Core._Legacy.PackageActions { diff --git a/src/Umbraco.Tests/DependencyInjection/PackageActionCollectionTests.cs b/src/Umbraco.Tests/DependencyInjection/PackageActionCollectionTests.cs index 31be4a13a8..3561fecb4f 100644 --- a/src/Umbraco.Tests/DependencyInjection/PackageActionCollectionTests.cs +++ b/src/Umbraco.Tests/DependencyInjection/PackageActionCollectionTests.cs @@ -4,7 +4,6 @@ using System.Xml; using LightInject; using NUnit.Framework; using Umbraco.Core.Composing; -using Umbraco.Core.Plugins; using Umbraco.Core._Legacy.PackageActions; namespace Umbraco.Tests.DI diff --git a/src/Umbraco.Tests/DependencyInjection/ResolverBaseTest.cs b/src/Umbraco.Tests/DependencyInjection/ResolverBaseTest.cs index a910aaa2f3..d2ba95ccdf 100644 --- a/src/Umbraco.Tests/DependencyInjection/ResolverBaseTest.cs +++ b/src/Umbraco.Tests/DependencyInjection/ResolverBaseTest.cs @@ -5,7 +5,6 @@ using NUnit.Framework; using Umbraco.Core.Cache; using Umbraco.Core.Composing; using Umbraco.Core.Logging; -using Umbraco.Core.Plugins; namespace Umbraco.Tests.DI { diff --git a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs index eb48082ad8..d969cbbf7b 100644 --- a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs +++ b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs @@ -13,7 +13,6 @@ using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Web.Models.ContentEditing; using Umbraco.Core.Composing; -using Umbraco.Core.Plugins; using Umbraco.Tests.Testing; using Current = Umbraco.Web.Current; diff --git a/src/Umbraco.Tests/Plugins/PluginManagerExtensions.cs b/src/Umbraco.Tests/Plugins/PluginManagerExtensions.cs index 47b7b4ae46..e6a54c1161 100644 --- a/src/Umbraco.Tests/Plugins/PluginManagerExtensions.cs +++ b/src/Umbraco.Tests/Plugins/PluginManagerExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Umbraco.Core; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Tests.Plugins { diff --git a/src/Umbraco.Tests/Plugins/PluginManagerTests.cs b/src/Umbraco.Tests/Plugins/PluginManagerTests.cs index 502df7fff0..251120d12b 100644 --- a/src/Umbraco.Tests/Plugins/PluginManagerTests.cs +++ b/src/Umbraco.Tests/Plugins/PluginManagerTests.cs @@ -18,7 +18,7 @@ using Umbraco.Core.Profiling; using Umbraco.Core.PropertyEditors; using umbraco.DataLayer; using umbraco.uicontrols; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Web; using Umbraco.Web.PropertyEditors; diff --git a/src/Umbraco.Tests/Plugins/TypeFinderTests.cs b/src/Umbraco.Tests/Plugins/TypeFinderTests.cs index 1811ea5a57..0a6d2d677c 100644 --- a/src/Umbraco.Tests/Plugins/TypeFinderTests.cs +++ b/src/Umbraco.Tests/Plugins/TypeFinderTests.cs @@ -20,7 +20,7 @@ using Umbraco.Core.IO; using umbraco.DataLayer; using umbraco.uicontrols; using Umbraco.Core.Logging; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Stubs; using Umbraco.Web; diff --git a/src/Umbraco.Tests/Plugins/TypeHelperTests.cs b/src/Umbraco.Tests/Plugins/TypeHelperTests.cs index 9b2b1f03db..82affb5a16 100644 --- a/src/Umbraco.Tests/Plugins/TypeHelperTests.cs +++ b/src/Umbraco.Tests/Plugins/TypeHelperTests.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Reflection; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Web.Cache; using Umbraco.Web.Scheduling; diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs index 275eaed97d..917b6c1618 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs @@ -5,7 +5,6 @@ using Moq; using NUnit.Framework; using Umbraco.Core.Models.PublishedContent; using Umbraco.Web; -using Umbraco.Core.Plugins; using Umbraco.Web.PublishedCache; using Umbraco.Web.Routing; using Umbraco.Web.Security; diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs index 9370da60e6..3cc16c1dbd 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs @@ -5,7 +5,6 @@ using System.Web; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models.PublishedContent; -using Umbraco.Core.Plugins; using Umbraco.Core.PropertyEditors; using Umbraco.Web; using Umbraco.Web.PublishedCache; diff --git a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs index 1ae781351e..3546911ba6 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs @@ -10,7 +10,6 @@ using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Profiling; using Umbraco.Core.Composing; using Umbraco.Core.Persistence; -using Umbraco.Core.Plugins; namespace Umbraco.Tests.TestHelpers { diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs index c0968ebb11..c378739ec2 100644 --- a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs +++ b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs @@ -7,7 +7,7 @@ using System.Web.Routing; using System.Web.SessionState; using Umbraco.Core; using Umbraco.Core.Logging; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Web; namespace Umbraco.Tests.TestHelpers.Stubs diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs index 2c892d9163..3b46051566 100644 --- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs +++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs @@ -22,7 +22,6 @@ using Umbraco.Web; using Umbraco.Web.PublishedCache; using Umbraco.Web.PublishedCache.XmlPublishedCache; using Umbraco.Web.Security; -using Umbraco.Core.Plugins; using Umbraco.Web.Routing; using File = System.IO.File; using Umbraco.Core.Composing; diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs index fe5a4c337c..264da05244 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs @@ -21,7 +21,6 @@ using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.SqlSyntax; -using Umbraco.Core.Plugins; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; using Umbraco.Core.Strings; diff --git a/src/Umbraco.Tests/UI/LegacyDialogTests.cs b/src/Umbraco.Tests/UI/LegacyDialogTests.cs index 8cd01c64a7..6ea66761e3 100644 --- a/src/Umbraco.Tests/UI/LegacyDialogTests.cs +++ b/src/Umbraco.Tests/UI/LegacyDialogTests.cs @@ -8,7 +8,7 @@ using Umbraco.Web.UI; using umbraco; using umbraco.BusinessLogic; using umbraco.cms.presentation.user; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Web._Legacy.UI; namespace Umbraco.Tests.UI diff --git a/src/Umbraco.Web/Current.cs b/src/Umbraco.Web/Current.cs index 32b66d5c54..cae9641fa2 100644 --- a/src/Umbraco.Web/Current.cs +++ b/src/Umbraco.Web/Current.cs @@ -12,7 +12,7 @@ using Umbraco.Core.Macros; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Migrations; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; using Umbraco.Core.Services; diff --git a/src/Umbraco.Web/Editors/IEditorValidator.cs b/src/Umbraco.Web/Editors/IEditorValidator.cs index 0fe709eeef..2ee2b25bd6 100644 --- a/src/Umbraco.Web/Editors/IEditorValidator.cs +++ b/src/Umbraco.Web/Editors/IEditorValidator.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Web.Editors { diff --git a/src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/XmlDataIntegrityHealthCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/XmlDataIntegrityHealthCheck.cs index de3f56ccb0..e0117acd7b 100644 --- a/src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/XmlDataIntegrityHealthCheck.cs +++ b/src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/XmlDataIntegrityHealthCheck.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Core.Services; using Umbraco.Web.PublishedCache; diff --git a/src/Umbraco.Web/HealthCheck/HealthCheck.cs b/src/Umbraco.Web/HealthCheck/HealthCheck.cs index eb23a58298..5907fd0d07 100644 --- a/src/Umbraco.Web/HealthCheck/HealthCheck.cs +++ b/src/Umbraco.Web/HealthCheck/HealthCheck.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Runtime.Serialization; using Umbraco.Core; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Web.HealthCheck { diff --git a/src/Umbraco.Web/LightInjectExtensions.cs b/src/Umbraco.Web/LightInjectExtensions.cs index 57c3a6f3f3..580dc4117d 100644 --- a/src/Umbraco.Web/LightInjectExtensions.cs +++ b/src/Umbraco.Web/LightInjectExtensions.cs @@ -3,7 +3,7 @@ using System.Web.Http.Controllers; using System.Web.Mvc; using LightInject; using Umbraco.Core; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/Models/Trees/IApplication.cs b/src/Umbraco.Web/Models/Trees/IApplication.cs index f9c6166b35..f246960c20 100644 --- a/src/Umbraco.Web/Models/Trees/IApplication.cs +++ b/src/Umbraco.Web/Models/Trees/IApplication.cs @@ -1,4 +1,4 @@ -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Web.Models.Trees { diff --git a/src/Umbraco.Web/Mvc/PluginController.cs b/src/Umbraco.Web/Mvc/PluginController.cs index f0ba348d0d..c93e1144f1 100644 --- a/src/Umbraco.Web/Mvc/PluginController.cs +++ b/src/Umbraco.Web/Mvc/PluginController.cs @@ -6,7 +6,7 @@ using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Core.Services; using Umbraco.Web.Security; using Umbraco.Web.WebApi; diff --git a/src/Umbraco.Web/Mvc/PluginControllerArea.cs b/src/Umbraco.Web/Mvc/PluginControllerArea.cs index 488c4000b8..d63ef0b2bb 100644 --- a/src/Umbraco.Web/Mvc/PluginControllerArea.cs +++ b/src/Umbraco.Web/Mvc/PluginControllerArea.cs @@ -5,7 +5,7 @@ using System.Web.Mvc; using System.Web.Routing; using Umbraco.Core; using Umbraco.Core.Configuration; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Web.WebApi; namespace Umbraco.Web.Mvc diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs index 4dc3aae055..11823fd155 100644 --- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs +++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs @@ -10,7 +10,7 @@ using Umbraco.Core.Logging; using Umbraco.Web.Models; using Umbraco.Web.Routing; using System.Collections.Generic; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using LightInject; namespace Umbraco.Web.Mvc diff --git a/src/Umbraco.Web/PluginManagerExtensions.cs b/src/Umbraco.Web/PluginManagerExtensions.cs index d2be8774ec..050b21c522 100644 --- a/src/Umbraco.Web/PluginManagerExtensions.cs +++ b/src/Umbraco.Web/PluginManagerExtensions.cs @@ -9,7 +9,7 @@ using Umbraco.Web.Trees; using Umbraco.Web.WebApi; using umbraco; using umbraco.cms.presentation.Trees; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Web.Models.Trees; using Umbraco.Web._Legacy.Actions; diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/ImageCropDataSetTypeConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/ImageCropDataSetTypeConverter.cs index e7221b02cf..5e248e2fac 100644 --- a/src/Umbraco.Web/PropertyEditors/ValueConverters/ImageCropDataSetTypeConverter.cs +++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/ImageCropDataSetTypeConverter.cs @@ -3,7 +3,7 @@ using System.ComponentModel; using System.Globalization; using System.Linq; using Newtonsoft.Json.Linq; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Web.Models; namespace Umbraco.Web.PropertyEditors.ValueConverters diff --git a/src/Umbraco.Web/RelatedLinksTypeConverter.cs b/src/Umbraco.Web/RelatedLinksTypeConverter.cs index 74d2849c8a..c49f9a222c 100644 --- a/src/Umbraco.Web/RelatedLinksTypeConverter.cs +++ b/src/Umbraco.Web/RelatedLinksTypeConverter.cs @@ -8,7 +8,7 @@ using Newtonsoft.Json.Linq; using Umbraco.Core; using Umbraco.Core.Logging; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Web.Models; namespace Umbraco.Web diff --git a/src/Umbraco.Web/Security/Identity/AuthenticationOptionsExtensions.cs b/src/Umbraco.Web/Security/Identity/AuthenticationOptionsExtensions.cs index f503eeaeed..dc48aba336 100644 --- a/src/Umbraco.Web/Security/Identity/AuthenticationOptionsExtensions.cs +++ b/src/Umbraco.Web/Security/Identity/AuthenticationOptionsExtensions.cs @@ -3,7 +3,7 @@ using Microsoft.Owin; using Microsoft.Owin.Security; using Umbraco.Core; using Umbraco.Core.Logging; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Web.Security.Identity { diff --git a/src/Umbraco.Web/Services/ApplicationTreeService.cs b/src/Umbraco.Web/Services/ApplicationTreeService.cs index 09f5c91a1d..ef717dc16b 100644 --- a/src/Umbraco.Web/Services/ApplicationTreeService.cs +++ b/src/Umbraco.Web/Services/ApplicationTreeService.cs @@ -10,7 +10,7 @@ using Umbraco.Core.Events; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Models; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Core.Services; using Umbraco.Web.Trees; diff --git a/src/Umbraco.Web/Services/SectionService.cs b/src/Umbraco.Web/Services/SectionService.cs index 319858b0a3..8ae97a9e50 100644 --- a/src/Umbraco.Web/Services/SectionService.cs +++ b/src/Umbraco.Web/Services/SectionService.cs @@ -10,7 +10,7 @@ using Umbraco.Core.Events; using Umbraco.Core.IO; using Umbraco.Core.Models; using Umbraco.Core.Persistence.UnitOfWork; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Core.Services; using Umbraco.Web.Models.Trees; using File = System.IO.File; diff --git a/src/Umbraco.Web/Strategies/Migrations/PostMigrationComponent.cs b/src/Umbraco.Web/Strategies/Migrations/PostMigrationComponent.cs index 7e9d8402e6..9bd2a24130 100644 --- a/src/Umbraco.Web/Strategies/Migrations/PostMigrationComponent.cs +++ b/src/Umbraco.Web/Strategies/Migrations/PostMigrationComponent.cs @@ -1,7 +1,6 @@ using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Persistence.Migrations; -using Umbraco.Core.Plugins; using LightInject; namespace Umbraco.Web.Strategies.Migrations diff --git a/src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs b/src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs index 34239697c6..ae797f1f32 100644 --- a/src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs +++ b/src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs @@ -18,7 +18,7 @@ using Umbraco.Web.Mvc; using Umbraco.Web.WebApi; using umbraco.BusinessLogic; using umbraco.cms.presentation.Trees; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using ApplicationTree = Umbraco.Core.Models.ApplicationTree; using IAuthorizationFilter = System.Web.Http.Filters.IAuthorizationFilter; using UrlHelper = System.Web.Http.Routing.UrlHelper; diff --git a/src/Umbraco.Web/Trees/LegacyBaseTreeAttribute.cs b/src/Umbraco.Web/Trees/LegacyBaseTreeAttribute.cs index 354524dba4..919f8aa038 100644 --- a/src/Umbraco.Web/Trees/LegacyBaseTreeAttribute.cs +++ b/src/Umbraco.Web/Trees/LegacyBaseTreeAttribute.cs @@ -1,7 +1,7 @@ using System; using Umbraco.Core; using umbraco.cms.presentation.Trees; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Web.Trees { diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs index bcef8fd6bf..4fbc619370 100644 --- a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs @@ -7,7 +7,7 @@ using System.Web.Http.Filters; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Web.Models.ContentEditing; namespace Umbraco.Web.WebApi.Filters diff --git a/src/Umbraco.Web/WebApi/UmbracoApiController.cs b/src/Umbraco.Web/WebApi/UmbracoApiController.cs index 769514ee78..3616f032d8 100644 --- a/src/Umbraco.Web/WebApi/UmbracoApiController.cs +++ b/src/Umbraco.Web/WebApi/UmbracoApiController.cs @@ -1,4 +1,4 @@ -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; namespace Umbraco.Web.WebApi { diff --git a/src/Umbraco.Web/WebRuntimeComponent.cs b/src/Umbraco.Web/WebRuntimeComponent.cs index a320f2a186..9ab997ee07 100644 --- a/src/Umbraco.Web/WebRuntimeComponent.cs +++ b/src/Umbraco.Web/WebRuntimeComponent.cs @@ -20,7 +20,6 @@ using Umbraco.Core.Dictionary; using Umbraco.Core.Events; using Umbraco.Core.Logging; using Umbraco.Core.Macros; -using Umbraco.Core.Plugins; using Umbraco.Core.Profiling; using Umbraco.Core.PropertyEditors; using Umbraco.Core.PropertyEditors.ValueConverters; diff --git a/src/Umbraco.Web/WebServices/ExamineManagementApiController.cs b/src/Umbraco.Web/WebServices/ExamineManagementApiController.cs index 8eb619af39..673e864e4b 100644 --- a/src/Umbraco.Web/WebServices/ExamineManagementApiController.cs +++ b/src/Umbraco.Web/WebServices/ExamineManagementApiController.cs @@ -12,7 +12,7 @@ using Lucene.Net.Search; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Logging; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Core.Services; using Umbraco.Web.Search; using Umbraco.Web.WebApi; diff --git a/src/Umbraco.Web/_Legacy/Actions/Action.cs b/src/Umbraco.Web/_Legacy/Actions/Action.cs index 1036d47f36..89dc7e435f 100644 --- a/src/Umbraco.Web/_Legacy/Actions/Action.cs +++ b/src/Umbraco.Web/_Legacy/Actions/Action.cs @@ -5,9 +5,9 @@ using System.Text.RegularExpressions; using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Models.Membership; -using Umbraco.Core.Plugins; +using Umbraco.Core.Composing; using Umbraco.Core.Services; -using TypeFinder = Umbraco.Core.Plugins.TypeFinder; +using TypeFinder = Umbraco.Core.Composing.TypeFinder; namespace Umbraco.Web._Legacy.Actions { diff --git a/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs b/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs index bfe2c8ab86..6450a44ffa 100644 --- a/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Reflection; using LightInject; using Umbraco.Core.Composing; -using Umbraco.Core.Plugins; using Umbraco.Web.UI.Pages; namespace Umbraco.Web._Legacy.Actions diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs index 2c4aa17b5a..fea830b12d 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; using System.Linq; -using Umbraco.Core; using Umbraco.Web; -using umbraco.BusinessLogic; -using Umbraco.Core.Plugins; +using Current = Umbraco.Web.Current; namespace umbraco.cms.presentation.Trees {