From 7ea9c9c8e2fbd16dec6be61482973f2baf81157a Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 30 May 2017 18:13:11 +0200 Subject: [PATCH] Move Web.Current to Composing --- src/Umbraco.Compat7/Core/ActionsResolver.cs | 2 +- src/Umbraco.Compat7/Core/Logging/LogHelper.cs | 1 + .../Web/Media/ThumbnailProvidersResolver.cs | 5 ++--- .../Web/Mvc/DefaultRenderMvcControllerResolver.cs | 2 +- .../Web/Mvc/FilteredControllerFactoriesResolver.cs | 2 +- .../Web/PublishedCache/FacadeServiceResolver.cs | 2 +- .../Web/Routing/ContentFinderResolver.cs | 2 +- .../Web/Routing/ContentLastChangeFinderResolver.cs | 2 +- .../Web/Routing/SiteDomainHelperResolver.cs | 2 +- .../Web/Routing/UrlProviderResolver.cs | 2 +- src/Umbraco.Core/Composing/Current.cs | 4 ++-- src/Umbraco.Core/Umbraco.Core.csproj | 12 ++++++++---- .../PublishedCache/PublishedContentCacheTests.cs | 1 + .../PublishedCache/PublishedMediaCacheTests.cs | 2 +- src/Umbraco.Tests/Misc/LibraryTests.cs | 2 +- .../Models/Mapping/ContentWebModelMappingTests.cs | 2 +- .../PublishedContentDataTableTests.cs | 3 ++- .../PublishedContentExtensionTests.cs | 1 + .../PublishedContent/PublishedContentMoreTests.cs | 2 +- .../PublishedContent/PublishedContentTestBase.cs | 2 +- .../PublishedContent/PublishedMediaTests.cs | 2 +- .../ContentFinderByNiceUrlAndTemplateTests.cs | 2 +- .../Routing/RenderRouteHandlerTests.cs | 2 +- .../Security/BackOfficeCookieManagerTests.cs | 1 + .../Services/ContentServicePerformanceTest.cs | 2 +- .../Services/Importing/PackageImportTests.cs | 2 +- .../TestHelpers/TestWithDatabaseBase.cs | 2 +- src/Umbraco.Tests/Testing/TestingTests/MockTests.cs | 2 +- src/Umbraco.Tests/Testing/UmbracoTestBase.cs | 2 +- .../TreesAndSections/ApplicationTreeTest.cs | 2 +- .../Mvc/RenderIndexActionSelectorAttributeTests.cs | 1 + src/Umbraco.Tests/Web/Mvc/RenderModelBinderTests.cs | 2 +- src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs | 1 + src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs | 1 + src/Umbraco.Tests/Web/WebExtensionMethodTests.cs | 2 +- .../umbraco/create/PartialViewMacro.ascx.cs | 1 + src/Umbraco.Web/Cache/CacheRefresherComponent.cs | 1 + src/Umbraco.Web/Cache/ContentCacheRefresher.cs | 1 + src/Umbraco.Web/Cache/DistributedCache.cs | 1 + src/Umbraco.Web/Cache/MediaCacheRefresher.cs | 1 + src/Umbraco.Web/CanvasDesignerUtility.cs | 1 + src/Umbraco.Web/{ => Composing}/Current.cs | 13 ++++++++----- src/Umbraco.Web/CompositionExtensions.cs | 9 ++------- .../Dictionary/UmbracoCultureDictionary.cs | 1 + src/Umbraco.Web/Editors/AuthenticationController.cs | 1 + src/Umbraco.Web/Editors/BackOfficeController.cs | 1 + src/Umbraco.Web/Editors/CodeFileController.cs | 1 + src/Umbraco.Web/Editors/ContentControllerBase.cs | 1 + .../Editors/ContentPostValidateAttribute.cs | 1 + src/Umbraco.Web/Editors/ContentTypeController.cs | 1 + .../Editors/ContentTypeControllerBase.cs | 1 + src/Umbraco.Web/Editors/DataTypeController.cs | 1 + .../Editors/DataTypeValidateAttribute.cs | 1 + .../Editors/MediaPostValidateAttribute.cs | 1 + src/Umbraco.Web/Editors/MediaTypeController.cs | 1 + src/Umbraco.Web/Editors/ValidationHelper.cs | 3 +-- .../Checks/Config/ConfigurationService.cs | 1 + src/Umbraco.Web/HealthCheck/HealthCheckAction.cs | 1 + src/Umbraco.Web/HtmlHelperRenderExtensions.cs | 1 + src/Umbraco.Web/HttpUrlHelperExtensions.cs | 1 + src/Umbraco.Web/ImageCropperBaseExtensions.cs | 1 + .../Install/Controllers/InstallPackageController.cs | 1 + src/Umbraco.Web/Install/FilePermissionHelper.cs | 1 + .../Install/HttpInstallAuthorizeAttribute.cs | 1 + .../Install/InstallAuthorizeAttribute.cs | 1 + src/Umbraco.Web/Install/InstallHelper.cs | 1 + .../InstallSteps/MajorVersion7UpgradeReport.cs | 1 + .../Install/InstallSteps/SetUmbracoVersionStep.cs | 1 + .../Install/InstallSteps/StarterKitDownloadStep.cs | 1 + .../Install/InstallSteps/StarterKitInstallStep.cs | 1 + src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs | 1 + src/Umbraco.Web/Macros/MacroRenderer.cs | 1 + src/Umbraco.Web/Macros/UserControlMacroEngine.cs | 1 + src/Umbraco.Web/Macros/XsltMacroEngine.cs | 1 + src/Umbraco.Web/Media/ImageUrl.cs | 1 + src/Umbraco.Web/Models/ContentExtensions.cs | 1 + .../Mapping/AvailablePropertyEditorsResolver.cs | 1 + .../Models/Mapping/ContentModelMapper.cs | 1 + .../Models/Mapping/ContentPropertyBasicConverter.cs | 1 + .../Models/Mapping/DataTypeModelMapper.cs | 1 + .../Models/Mapping/DatabaseTypeResolver.cs | 1 + src/Umbraco.Web/Models/Mapping/MacroModelMapper.cs | 1 + src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs | 1 + src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs | 1 + .../Models/Mapping/PreValueDisplayResolver.cs | 1 + .../Models/Mapping/TabsAndPropertiesResolver.cs | 1 + src/Umbraco.Web/Models/PublishedProperty.cs | 1 + src/Umbraco.Web/Models/Trees/MenuItem.cs | 1 + src/Umbraco.Web/Models/Trees/MenuItemList.cs | 1 + src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs | 1 + src/Umbraco.Web/Mvc/ContentModelBinder.cs | 1 + src/Umbraco.Web/Mvc/ControllerContextExtensions.cs | 1 + .../Mvc/EnsurePublishedContentRequestAttribute.cs | 1 + src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs | 1 + src/Umbraco.Web/Mvc/ProfilingView.cs | 1 + src/Umbraco.Web/Mvc/ProfilingViewEngine.cs | 1 + src/Umbraco.Web/Mvc/RenderRouteHandler.cs | 3 ++- src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs | 1 + src/Umbraco.Web/Mvc/UmbracoControllerFactory.cs | 1 + src/Umbraco.Web/Mvc/UmbracoPageResult.cs | 1 + src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs | 1 + src/Umbraco.Web/NotificationServiceExtensions.cs | 1 + .../PropertyEditors/PublishValueValueEditor.cs | 1 + .../PublishValuesMultipleValueEditor.cs | 1 + .../PropertyEditors/UploadFileTypeValidator.cs | 1 + .../PublishedCache/NuCache/DataSource/Database.cs | 1 + .../PublishedCache/NuCache/FacadeService.cs | 1 + .../PublishedCache/NuCache/PublishedContent.cs | 1 + .../XmlPublishedCache/PreviewContent.cs | 1 + .../XmlPublishedCache/PublishedMediaCache.cs | 3 ++- .../XmlPublishedCache/XmlPublishedContent.cs | 1 + .../PublishedCache/XmlPublishedCache/XmlStore.cs | 1 + src/Umbraco.Web/PublishedContentExtensions.cs | 1 + src/Umbraco.Web/Routing/AliasUrlProvider.cs | 1 + .../Routing/ContentFinderByNiceUrlAndTemplate.cs | 1 + src/Umbraco.Web/Routing/DomainHelper.cs | 1 + src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs | 1 + .../Routing/RedirectTrackingComponent.cs | 1 + src/Umbraco.Web/Routing/UrlProvider.cs | 1 + src/Umbraco.Web/Routing/UrlProviderExtensions.cs | 1 + src/Umbraco.Web/Search/ExamineComponent.cs | 1 + src/Umbraco.Web/Search/LuceneIndexerExtensions.cs | 1 + .../Security/Identity/AppBuilderExtensions.cs | 1 + .../Identity/UmbracoBackOfficeCookieAuthOptions.cs | 1 + src/Umbraco.Web/Security/MembershipHelper.cs | 1 + .../Security/Providers/MembersMembershipProvider.cs | 1 + .../Security/Providers/MembersRoleProvider.cs | 1 + .../Security/Providers/UmbracoMembershipProvider.cs | 1 + .../Security/Providers/UsersMembershipProvider.cs | 1 + src/Umbraco.Web/Security/WebSecurity.cs | 1 + .../DatabaseServerRegistrarAndMessengerComponent.cs | 1 + .../Migrations/RebuildXmlCachesAfterUpgrade.cs | 1 + src/Umbraco.Web/Strategies/PublicAccessComponent.cs | 1 + src/Umbraco.Web/Templates/TemplateRenderer.cs | 1 + src/Umbraco.Web/Templates/TemplateUtilities.cs | 1 + src/Umbraco.Web/Trees/ApplicationTreeController.cs | 1 + src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs | 3 +-- src/Umbraco.Web/Trees/ContentTreeController.cs | 1 + src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs | 1 + src/Umbraco.Web/Trees/LegacyTreeJavascript.cs | 1 + .../Trees/PartialViewMacrosTreeController.cs | 1 + src/Umbraco.Web/Trees/PartialViewsTreeController.cs | 1 + src/Umbraco.Web/Trees/ScriptsTreeController.cs | 1 + src/Umbraco.Web/Trees/StylesheetsTreeController.cs | 1 + src/Umbraco.Web/Trees/XsltTreeController.cs | 1 + src/Umbraco.Web/UI/CdfLogger.cs | 1 + .../UI/Controls/InsertMacroSplitButton.cs | 1 + src/Umbraco.Web/UI/Controls/UmbracoControl.cs | 1 + src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs | 1 + .../UI/JavaScript/AssetInitialization.cs | 1 + src/Umbraco.Web/UI/Pages/BasePage.cs | 1 + src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs | 1 + src/Umbraco.Web/Umbraco.Web.csproj | 5 +++-- src/Umbraco.Web/UmbracoComponentRenderer.cs | 1 + src/Umbraco.Web/UmbracoContext.cs | 4 ++-- src/Umbraco.Web/UmbracoDefaultOwinStartup.cs | 1 + src/Umbraco.Web/UmbracoHelper.cs | 1 + src/Umbraco.Web/UmbracoModule.cs | 1 + src/Umbraco.Web/UrlHelperExtensions.cs | 1 + src/Umbraco.Web/UrlHelperRenderExtensions.cs | 1 + .../WebApi/Binders/ContentItemBaseBinder.cs | 1 + .../WebApi/Filters/AngularAntiForgeryHelper.cs | 1 + .../Filters/AppendCurrentEventMessagesAttribute.cs | 1 + .../WebApi/Filters/ContentItemValidationHelper.cs | 1 + .../EnsureUserPermissionForContentAttribute.cs | 1 + .../EnsureUserPermissionForMediaAttribute.cs | 1 + .../Filters/FileUploadCleanupFilterAttribute.cs | 1 + .../FilterAllowedOutgoingContentAttribute.cs | 1 + .../WebApi/Filters/LegacyTreeAuthorizeAttribute.cs | 1 + .../Filters/UmbracoApplicationAuthorizeAttribute.cs | 1 + .../WebApi/Filters/UmbracoTreeAuthorizeAttribute.cs | 1 + src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs | 1 + src/Umbraco.Web/WebRuntimeComponent.cs | 1 + .../WebServices/CoreStringsController.cs | 1 + src/Umbraco.Web/WebServices/UmbracoHttpHandler.cs | 1 + src/Umbraco.Web/WebServices/UmbracoWebService.cs | 1 + src/Umbraco.Web/_Legacy/Actions/Action.cs | 4 +--- .../_Legacy/PackageActions/addApplication.cs | 1 + .../_Legacy/PackageActions/addApplicationTree.cs | 1 + .../PackageActions/addStringToHtmlElement.cs | 1 + .../_Legacy/PackageActions/publishRootDocument.cs | 1 + src/Umbraco.Web/_Legacy/UI/LegacyDialogTask.cs | 1 + .../umbraco.presentation/default.aspx.cs | 1 + src/Umbraco.Web/umbraco.presentation/item.cs | 1 + src/Umbraco.Web/umbraco.presentation/library.cs | 1 + src/Umbraco.Web/umbraco.presentation/page.cs | 1 + src/Umbraco.Web/umbraco.presentation/template.cs | 1 + .../umbraco.presentation/umbraco/Trees/BaseTree.cs | 1 + .../umbraco/Trees/TreeDefinitionCollection.cs | 2 +- .../umbraco/controls/ContentPicker.cs | 1 + .../umbraco/controls/Tree/JTreeContextMenu.cs | 1 + .../umbraco/controls/Tree/JTreeContextMenuItem.cs | 1 + .../umbraco/controls/dualSelectBox.cs | 1 + .../umbraco/create/CreatedPackageTasks.cs | 1 + .../umbraco/create/MemberGroupTasks.cs | 1 + .../umbraco/create/PartialViewTasksBase.cs | 1 + .../umbraco/create/ScriptTasks.cs | 1 + .../umbraco/create/StylesheetTasks.cs | 1 + .../umbraco/create/XsltTasks.cs | 1 + .../umbraco/create/dictionaryTasks.cs | 1 + .../umbraco/create/stylesheetPropertyTasks.cs | 1 + .../umbraco/create/userTasks.cs | 1 + .../umbraco/dashboard/FeedProxy.aspx.cs | 1 + .../developer/Macros/assemblyBrowser.aspx.cs | 1 + .../umbraco/developer/Macros/editMacro.aspx.cs | 1 + .../umbraco/developer/Packages/installer.aspx.cs | 1 + .../RelationTypes/RelationTypesWebService.asmx.cs | 1 + .../umbraco/developer/Xslt/xsltVisualize.aspx.cs | 1 + .../umbraco/dialogs/AssignDomain2.aspx.cs | 1 + .../umbraco/dialogs/Preview.aspx.cs | 1 + .../umbraco/dialogs/cruds.aspx.cs | 1 + .../umbraco/dialogs/importDocumenttype.aspx.cs | 1 + .../umbraco/dialogs/notifications.aspx.cs | 1 + .../umbraco/dialogs/protectPage.aspx.cs | 1 + .../umbraco/dialogs/sendToTranslation.aspx.cs | 1 + .../umbraco/dialogs/sort.aspx.cs | 1 + .../umbraco/dialogs/umbracoField.aspx.cs | 1 + .../umbraco/dialogs/viewAuditTrail.aspx.cs | 1 + .../umbraco.presentation/umbraco/endPreview.aspx.cs | 1 + .../umbraco/settings/editTemplate.aspx.cs | 1 + .../umbraco/settings/scripts/editScript.aspx.cs | 1 + .../umbraco/templateControls/Item.cs | 1 + .../umbraco/templateControls/ItemRenderer.cs | 1 + .../umbraco/templateControls/Macro.cs | 1 + .../umbraco/users/EditUser.aspx.cs | 1 + .../umbraco/users/UserPermissions.cs | 1 + .../umbraco/users/UserTypeTasks.cs | 1 + .../umbraco/webservices/CacheRefresher.asmx.cs | 1 + .../umbraco/webservices/CheckForUpgrade.asmx.cs | 1 + .../umbraco/webservices/nodeSorter.asmx.cs | 1 + 230 files changed, 253 insertions(+), 60 deletions(-) rename src/Umbraco.Web/{ => Composing}/Current.cs (96%) diff --git a/src/Umbraco.Compat7/Core/ActionsResolver.cs b/src/Umbraco.Compat7/Core/ActionsResolver.cs index f8f78bc180..3ee2a26ee0 100644 --- a/src/Umbraco.Compat7/Core/ActionsResolver.cs +++ b/src/Umbraco.Compat7/Core/ActionsResolver.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Umbraco.Web._Legacy.Actions; -using WebCurrent = Umbraco.Web.Current; +using WebCurrent = Umbraco.Web.Composing.Current; // ReSharper disable once CheckNamespace namespace Umbraco.Core diff --git a/src/Umbraco.Compat7/Core/Logging/LogHelper.cs b/src/Umbraco.Compat7/Core/Logging/LogHelper.cs index e5a49a1de9..6d760f6f19 100644 --- a/src/Umbraco.Compat7/Core/Logging/LogHelper.cs +++ b/src/Umbraco.Compat7/Core/Logging/LogHelper.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using System.Web; +using Umbraco.Core.Composing; using Umbraco.Web; // ReSharper disable once CheckNamespace diff --git a/src/Umbraco.Compat7/Web/Media/ThumbnailProvidersResolver.cs b/src/Umbraco.Compat7/Web/Media/ThumbnailProvidersResolver.cs index 2acf1f3e92..9b76be23e9 100644 --- a/src/Umbraco.Compat7/Web/Media/ThumbnailProvidersResolver.cs +++ b/src/Umbraco.Compat7/Web/Media/ThumbnailProvidersResolver.cs @@ -2,8 +2,7 @@ using Umbraco.Core.Media; using Umbraco.Core.ObjectResolution; using Umbraco.Web.Media.ThumbnailProviders; -using CoreCurrent = Umbraco.Core.Composing.Current; -using WebCurrent = Umbraco.Web.Current; +using WebCurrent = Umbraco.Web.Composing.Current; using LightInject; // ReSharper disable once CheckNamespace @@ -16,7 +15,7 @@ namespace Umbraco.Web.Media { } public static ThumbnailProvidersResolver Current { get; } - = new ThumbnailProvidersResolver(CoreCurrent.Container.GetInstance()); + = new ThumbnailProvidersResolver(WebCurrent.Container.GetInstance()); public IEnumerable Providers => WebCurrent.ThumbnailProviders; diff --git a/src/Umbraco.Compat7/Web/Mvc/DefaultRenderMvcControllerResolver.cs b/src/Umbraco.Compat7/Web/Mvc/DefaultRenderMvcControllerResolver.cs index 5ec70f0f44..28e4eacadb 100644 --- a/src/Umbraco.Compat7/Web/Mvc/DefaultRenderMvcControllerResolver.cs +++ b/src/Umbraco.Compat7/Web/Mvc/DefaultRenderMvcControllerResolver.cs @@ -1,5 +1,5 @@ using System; -using WebCurrent = Umbraco.Web.Current; +using WebCurrent = Umbraco.Web.Composing.Current; // ReSharper disable once CheckNamespace namespace Umbraco.Web.Mvc diff --git a/src/Umbraco.Compat7/Web/Mvc/FilteredControllerFactoriesResolver.cs b/src/Umbraco.Compat7/Web/Mvc/FilteredControllerFactoriesResolver.cs index e4cefbc3df..edf185fb01 100644 --- a/src/Umbraco.Compat7/Web/Mvc/FilteredControllerFactoriesResolver.cs +++ b/src/Umbraco.Compat7/Web/Mvc/FilteredControllerFactoriesResolver.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Umbraco.Core.ObjectResolution; using CoreCurrent = Umbraco.Core.Composing.Current; -using WebCurrent = Umbraco.Web.Current; +using WebCurrent = Umbraco.Web.Composing.Current; using LightInject; // ReSharper disable once CheckNamespace diff --git a/src/Umbraco.Compat7/Web/PublishedCache/FacadeServiceResolver.cs b/src/Umbraco.Compat7/Web/PublishedCache/FacadeServiceResolver.cs index 3aee10226e..f5063d18ab 100644 --- a/src/Umbraco.Compat7/Web/PublishedCache/FacadeServiceResolver.cs +++ b/src/Umbraco.Compat7/Web/PublishedCache/FacadeServiceResolver.cs @@ -1,4 +1,4 @@ -using WebCurrent = Umbraco.Web.Current; +using WebCurrent = Umbraco.Web.Composing.Current; // ReSharper disable once CheckNamespace namespace Umbraco.Web.PublishedCache diff --git a/src/Umbraco.Compat7/Web/Routing/ContentFinderResolver.cs b/src/Umbraco.Compat7/Web/Routing/ContentFinderResolver.cs index b4fc891f31..48951c3cd3 100644 --- a/src/Umbraco.Compat7/Web/Routing/ContentFinderResolver.cs +++ b/src/Umbraco.Compat7/Web/Routing/ContentFinderResolver.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Umbraco.Core.ObjectResolution; using CoreCurrent = Umbraco.Core.Composing.Current; -using WebCurrent = Umbraco.Web.Current; +using WebCurrent = Umbraco.Web.Composing.Current; using LightInject; // ReSharper disable once CheckNamespace diff --git a/src/Umbraco.Compat7/Web/Routing/ContentLastChangeFinderResolver.cs b/src/Umbraco.Compat7/Web/Routing/ContentLastChangeFinderResolver.cs index 424eba8f26..cb13a1b11e 100644 --- a/src/Umbraco.Compat7/Web/Routing/ContentLastChangeFinderResolver.cs +++ b/src/Umbraco.Compat7/Web/Routing/ContentLastChangeFinderResolver.cs @@ -1,7 +1,7 @@ using System; using Umbraco.Core.Composing; using CoreCurrent = Umbraco.Core.Composing.Current; -using WebCurrent = Umbraco.Web.Current; +using WebCurrent = Umbraco.Web.Composing.Current; // ReSharper disable once CheckNamespace namespace Umbraco.Web.Routing diff --git a/src/Umbraco.Compat7/Web/Routing/SiteDomainHelperResolver.cs b/src/Umbraco.Compat7/Web/Routing/SiteDomainHelperResolver.cs index 21b6df6137..ee3bb77f68 100644 --- a/src/Umbraco.Compat7/Web/Routing/SiteDomainHelperResolver.cs +++ b/src/Umbraco.Compat7/Web/Routing/SiteDomainHelperResolver.cs @@ -1,6 +1,6 @@ using Umbraco.Core.Composing; using CoreCurrent = Umbraco.Core.Composing.Current; -using WebCurrent = Umbraco.Web.Current; +using WebCurrent = Umbraco.Web.Composing.Current; // ReSharper disable once CheckNamespace namespace Umbraco.Web.Routing diff --git a/src/Umbraco.Compat7/Web/Routing/UrlProviderResolver.cs b/src/Umbraco.Compat7/Web/Routing/UrlProviderResolver.cs index 632d62a197..b25fdc0aa4 100644 --- a/src/Umbraco.Compat7/Web/Routing/UrlProviderResolver.cs +++ b/src/Umbraco.Compat7/Web/Routing/UrlProviderResolver.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Umbraco.Core.ObjectResolution; using CoreCurrent = Umbraco.Core.Composing.Current; -using WebCurrent = Umbraco.Web.Current; +using WebCurrent = Umbraco.Web.Composing.Current; using LightInject; // ReSharper disable once CheckNamespace diff --git a/src/Umbraco.Core/Composing/Current.cs b/src/Umbraco.Core/Composing/Current.cs index ead06fa42c..dfbc81ee9d 100644 --- a/src/Umbraco.Core/Composing/Current.cs +++ b/src/Umbraco.Core/Composing/Current.cs @@ -27,7 +27,7 @@ namespace Umbraco.Core.Composing /// public static class Current { - private static ServiceContainer _container; + private static IServiceContainer _container; private static IShortStringHelper _shortStringHelper; private static ILogger _logger; @@ -37,7 +37,7 @@ namespace Umbraco.Core.Composing /// /// Gets or sets the DI container. /// - internal static ServiceContainer Container + internal static IServiceContainer Container { get { diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 6c3e3e9fdb..f50339658f 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -76,7 +76,14 @@ - + + Component @@ -86,9 +93,6 @@ Properties\SolutionInfo.cs - - Constants.cs - diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs index e9d0583441..9a7f4e1a4c 100644 --- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs +++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs @@ -4,6 +4,7 @@ using Moq; using NUnit.Framework; using umbraco.BusinessLogic; using Umbraco.Core.Cache; +using Umbraco.Core.Composing; using Umbraco.Core.Models.PublishedContent; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs index 5fce4c3078..2e94816576 100644 --- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs +++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs @@ -11,7 +11,7 @@ using Umbraco.Core.Strings; using Umbraco.Tests.TestHelpers; using Umbraco.Web.PublishedCache.XmlPublishedCache; using Umbraco.Tests.Testing; -using Current = Umbraco.Web.Current; +using Current = Umbraco.Web.Composing.Current; using LightInject; namespace Umbraco.Tests.Cache.PublishedCache diff --git a/src/Umbraco.Tests/Misc/LibraryTests.cs b/src/Umbraco.Tests/Misc/LibraryTests.cs index 2b0bdd36b0..7ea0cebc99 100644 --- a/src/Umbraco.Tests/Misc/LibraryTests.cs +++ b/src/Umbraco.Tests/Misc/LibraryTests.cs @@ -41,7 +41,7 @@ namespace Umbraco.Tests.Misc .PropertyTypes.Count()); var umbracoContext = GetUmbracoContext("/test"); - Umbraco.Web.Current.UmbracoContextAccessor.UmbracoContext = umbracoContext; + Umbraco.Web.Composing.Current.UmbracoContextAccessor.UmbracoContext = umbracoContext; } /// diff --git a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs index d969cbbf7b..3061c3baf4 100644 --- a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs +++ b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs @@ -14,7 +14,7 @@ using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Web.Models.ContentEditing; using Umbraco.Core.Composing; using Umbraco.Tests.Testing; -using Current = Umbraco.Web.Current; +using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Tests.Models.Mapping { diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs index 1f3d6e3ba8..e7000af1b9 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs @@ -4,6 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Tests.TestHelpers; @@ -59,7 +60,7 @@ namespace Umbraco.Tests.PublishedContent var umbracoContext = GetUmbracoContext("/test"); //set the UmbracoContext.Current since the extension methods rely on it - Umbraco.Web.Current.UmbracoContextAccessor.UmbracoContext = umbracoContext; + Umbraco.Web.Composing.Current.UmbracoContextAccessor.UmbracoContext = umbracoContext; } public override void TearDown() diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs index 632161a576..48016a76d7 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using NUnit.Framework; +using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs index 917b6c1618..f8c6e1f760 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs @@ -59,7 +59,7 @@ namespace Umbraco.Tests.PublishedContent TestObjects.GetUmbracoSettings(), Enumerable.Empty()); - Umbraco.Web.Current.UmbracoContextAccessor.UmbracoContext = umbracoContext; + Umbraco.Web.Composing.Current.UmbracoContextAccessor.UmbracoContext = umbracoContext; } public override void TearDown() diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs index f1311ab869..35ddfc16be 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs @@ -27,7 +27,7 @@ namespace Umbraco.Tests.PublishedContent ContentTypesCache.GetPublishedContentTypeByAlias = (alias) => type; var umbracoContext = GetUmbracoContext("/test"); - Umbraco.Web.Current.UmbracoContextAccessor.UmbracoContext = umbracoContext; + Umbraco.Web.Composing.Current.UmbracoContextAccessor.UmbracoContext = umbracoContext; } protected override void Compose() diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs index be10a97681..9b43e14b8e 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs @@ -17,7 +17,7 @@ using Umbraco.Core.Cache; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Strings; using UmbracoExamine; -using Current = Umbraco.Web.Current; +using Current = Umbraco.Web.Composing.Current; using Umbraco.Tests.Testing; using LightInject; diff --git a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlAndTemplateTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlAndTemplateTests.cs index 007998c737..57a51c07ba 100644 --- a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlAndTemplateTests.cs +++ b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlAndTemplateTests.cs @@ -3,7 +3,7 @@ using Umbraco.Tests.TestHelpers; using Umbraco.Web.Routing; using Umbraco.Core.Models; using Umbraco.Tests.Testing; -using Current = Umbraco.Web.Current; +using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Tests.Routing { diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs index 771c4de5cc..df6168c27d 100644 --- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs +++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs @@ -18,7 +18,7 @@ using Umbraco.Web.WebApi; using Umbraco.Core.Strings; using Umbraco.Core.Composing; using Umbraco.Tests.Testing; -using Current = Umbraco.Web.Current; +using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Tests.Routing { diff --git a/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs b/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs index 1ee031ba83..b0b523043a 100644 --- a/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs +++ b/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs @@ -6,6 +6,7 @@ using Microsoft.Owin; using Moq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Tests.Testing; using Umbraco.Web; using Umbraco.Web.PublishedCache; diff --git a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs index 27e94fdf59..abe052cce2 100644 --- a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs +++ b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs @@ -15,7 +15,7 @@ using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.TestHelpers.Stubs; using Umbraco.Tests.Testing; -using Current = Umbraco.Web.Current; +using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Tests.Services { diff --git a/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs b/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs index 49c88d76a7..481924f122 100644 --- a/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs +++ b/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs @@ -8,7 +8,7 @@ using Umbraco.Core; using Umbraco.Core.Models.Rdbms; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; -using Current = Umbraco.Web.Current; +using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Tests.Services.Importing { diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs index 3b46051566..e2462ad8b4 100644 --- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs +++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs @@ -352,7 +352,7 @@ namespace Umbraco.Tests.TestHelpers urlProviders ?? Enumerable.Empty()); if (setSingleton) - Umbraco.Web.Current.UmbracoContextAccessor.UmbracoContext = umbracoContext; + Umbraco.Web.Composing.Current.UmbracoContextAccessor.UmbracoContext = umbracoContext; return umbracoContext; } diff --git a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs index 4f5897e04f..c219f58717 100644 --- a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs +++ b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs @@ -12,7 +12,7 @@ using Umbraco.Tests.TestHelpers.Stubs; using Umbraco.Web; using Umbraco.Web.Routing; using Umbraco.Web.Security; -using Current = Umbraco.Web.Current; +using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Tests.Testing.TestingTests { diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs index 264da05244..bb84e0f2f9 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs @@ -171,7 +171,7 @@ namespace Umbraco.Tests.Testing { // imported from TestWithSettingsBase // which was inherited by TestWithApplicationBase so pretty much used everywhere - Umbraco.Web.Current.UmbracoContextAccessor = new TestUmbracoContextAccessor(); + Umbraco.Web.Composing.Current.UmbracoContextAccessor = new TestUmbracoContextAccessor(); } protected virtual void ComposeCacheHelper() diff --git a/src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs b/src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs index 61eef28d5d..fd080b214d 100644 --- a/src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs +++ b/src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs @@ -6,7 +6,7 @@ using System; using System.Linq; using Umbraco.Tests.Testing; using Umbraco.Web.Services; -using Current = Umbraco.Web.Current; +using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Tests.TreesAndSections { diff --git a/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs b/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs index d488ab021f..05e5ab9a49 100644 --- a/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs +++ b/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs @@ -16,6 +16,7 @@ using Umbraco.Core.Services; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Stubs; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.Models; using Umbraco.Web.Mvc; using Umbraco.Web.PublishedCache; diff --git a/src/Umbraco.Tests/Web/Mvc/RenderModelBinderTests.cs b/src/Umbraco.Tests/Web/Mvc/RenderModelBinderTests.cs index f57aec0776..c24e44928b 100644 --- a/src/Umbraco.Tests/Web/Mvc/RenderModelBinderTests.cs +++ b/src/Umbraco.Tests/Web/Mvc/RenderModelBinderTests.cs @@ -10,7 +10,7 @@ using Umbraco.Core.Models.PublishedContent; using Umbraco.Tests.TestHelpers.Stubs; using Umbraco.Web.Models; using Umbraco.Web.Mvc; -using Current = Umbraco.Web.Current; +using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Tests.Web.Mvc { diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs index 9246ac5940..daa804de70 100644 --- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs +++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs @@ -15,6 +15,7 @@ using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Stubs; using Umbraco.Tests.Testing; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.Mvc; using Umbraco.Web.PublishedCache; using Umbraco.Web.Routing; diff --git a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs index efac9b7462..358c60ba10 100644 --- a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs +++ b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs @@ -8,6 +8,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; +using Umbraco.Core.Composing; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Logging; using Umbraco.Core.Models.PublishedContent; diff --git a/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs b/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs index fd2feed5a9..c909f84ac5 100644 --- a/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs +++ b/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs @@ -12,7 +12,7 @@ using Umbraco.Web.Mvc; using Umbraco.Web.PublishedCache; using Umbraco.Web.Routing; using Umbraco.Web.Security; -using Current = Umbraco.Web.Current; +using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Tests.Web { diff --git a/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx.cs b/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx.cs index 558aa91a9a..2e06e083e3 100644 --- a/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx.cs +++ b/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx.cs @@ -3,6 +3,7 @@ using System.Web.UI.WebControls; using Umbraco.Core; using Umbraco.Core.Services; using umbraco.presentation.create; +using Umbraco.Web.Composing; namespace Umbraco.Web.UI.Umbraco.Create { diff --git a/src/Umbraco.Web/Cache/CacheRefresherComponent.cs b/src/Umbraco.Web/Cache/CacheRefresherComponent.cs index 806a6082cd..c398f7e0df 100644 --- a/src/Umbraco.Web/Cache/CacheRefresherComponent.cs +++ b/src/Umbraco.Web/Cache/CacheRefresherComponent.cs @@ -16,6 +16,7 @@ using Umbraco.Core.Components; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; using Umbraco.Core.Services.Changes; +using Umbraco.Web.Composing; using Umbraco.Web.Security; using Umbraco.Web.Services; using Content = Umbraco.Core.Models.Content; diff --git a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs index 763310082c..4b7bc2a0d1 100644 --- a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs @@ -6,6 +6,7 @@ using Umbraco.Core.Configuration; using Umbraco.Core.Models; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Services.Changes; +using Umbraco.Web.Composing; using Umbraco.Web.PublishedCache; namespace Umbraco.Web.Cache diff --git a/src/Umbraco.Web/Cache/DistributedCache.cs b/src/Umbraco.Web/Cache/DistributedCache.cs index 2fb13eae7c..17e43f86d5 100644 --- a/src/Umbraco.Web/Cache/DistributedCache.cs +++ b/src/Umbraco.Web/Cache/DistributedCache.cs @@ -4,6 +4,7 @@ using System.Linq; using Umbraco.Core; using Umbraco.Core.Sync; using Umbraco.Core.Cache; +using Umbraco.Web.Composing; namespace Umbraco.Web.Cache { diff --git a/src/Umbraco.Web/Cache/MediaCacheRefresher.cs b/src/Umbraco.Web/Cache/MediaCacheRefresher.cs index 7253bf751a..591cd92b9b 100644 --- a/src/Umbraco.Web/Cache/MediaCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/MediaCacheRefresher.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Xml.Linq; using Umbraco.Core.Services; using Umbraco.Core.Services.Changes; +using Umbraco.Web.Composing; using Umbraco.Web.PublishedCache; namespace Umbraco.Web.Cache diff --git a/src/Umbraco.Web/CanvasDesignerUtility.cs b/src/Umbraco.Web/CanvasDesignerUtility.cs index 1cf236be33..512626e4e4 100644 --- a/src/Umbraco.Web/CanvasDesignerUtility.cs +++ b/src/Umbraco.Web/CanvasDesignerUtility.cs @@ -17,6 +17,7 @@ using Umbraco.Core.Models; using Umbraco.Core.Services; using System.Linq; using System.Text.RegularExpressions; +using Umbraco.Web.Composing; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/Current.cs b/src/Umbraco.Web/Composing/Current.cs similarity index 96% rename from src/Umbraco.Web/Current.cs rename to src/Umbraco.Web/Composing/Current.cs index cae9641fa2..9d1e3e4aad 100644 --- a/src/Umbraco.Web/Current.cs +++ b/src/Umbraco.Web/Composing/Current.cs @@ -30,9 +30,9 @@ using Umbraco.Web.WebApi; using Umbraco.Web._Legacy.Actions; using CoreCurrent = Umbraco.Core.Composing.Current; -namespace Umbraco.Web +namespace Umbraco.Web.Composing { - // see notes in Umbraco.Core.DependencyInjection.Current. + // see notes in Umbraco.Core.Composing.Current. public static class Current { private static readonly object Locker = new object(); @@ -55,7 +55,10 @@ namespace Umbraco.Web CoreCurrent.Reset(); } - private static ServiceContainer Container + /// + /// Gets the DI container. + /// + internal static IServiceContainer Container => CoreCurrent.Container; #region Temp & Special @@ -69,7 +72,7 @@ namespace Umbraco.Web if (_umbracoContextAccessor != null) return _umbracoContextAccessor; return _umbracoContextAccessor = Container.GetInstance(); } - set { _umbracoContextAccessor = value; } // for tests + set => _umbracoContextAccessor = value; // for tests } // clears the "current" umbraco context @@ -158,7 +161,7 @@ namespace Umbraco.Web // internal - can only be accessed through Composition at compose time internal static Type DefaultRenderMvcControllerType { - get { return _defaultRenderMvcControllerType; } + get => _defaultRenderMvcControllerType; set { if (value.Implements() == false) diff --git a/src/Umbraco.Web/CompositionExtensions.cs b/src/Umbraco.Web/CompositionExtensions.cs index 31677dbfe3..ab3a333356 100644 --- a/src/Umbraco.Web/CompositionExtensions.cs +++ b/src/Umbraco.Web/CompositionExtensions.cs @@ -1,12 +1,8 @@ using System; using LightInject; -using Umbraco.Core.Dictionary; using Umbraco.Core.Composing; +using Current = Umbraco.Web.Composing.Current; using Umbraco.Core.Macros; -using Umbraco.Core.Models.PublishedContent; -using Umbraco.Core.Persistence.Mappers; -using Umbraco.Core.Persistence.Migrations; -using Umbraco.Core.Sync; using Umbraco.Web.Editors; using Umbraco.Web.HealthCheck; using Umbraco.Web.Media; @@ -14,7 +10,6 @@ using Umbraco.Web.Media.ThumbnailProviders; using Umbraco.Web.Mvc; using Umbraco.Web.PublishedCache; using Umbraco.Web.Routing; -using Umbraco.Web.Strategies.Migrations; using Umbraco.Web._Legacy.Actions; // the namespace here is intentional - although defined in Umbraco.Web assembly, @@ -141,7 +136,7 @@ namespace Umbraco.Core.Components /// The composition. public static void SetDefaultRenderMvcControllerType(this Composition composition) { - Web.Current.DefaultRenderMvcControllerType = typeof(T); + Current.DefaultRenderMvcControllerType = typeof(T); } /// diff --git a/src/Umbraco.Web/Dictionary/UmbracoCultureDictionary.cs b/src/Umbraco.Web/Dictionary/UmbracoCultureDictionary.cs index e0754d1ffb..75433d6a2a 100644 --- a/src/Umbraco.Web/Dictionary/UmbracoCultureDictionary.cs +++ b/src/Umbraco.Web/Dictionary/UmbracoCultureDictionary.cs @@ -11,6 +11,7 @@ using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Models; using Umbraco.Core.Services; +using Umbraco.Web.Composing; namespace Umbraco.Web.Dictionary { diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs index ba797e192d..6d2661822f 100644 --- a/src/Umbraco.Web/Editors/AuthenticationController.cs +++ b/src/Umbraco.Web/Editors/AuthenticationController.cs @@ -25,6 +25,7 @@ using Umbraco.Web.WebApi; using Umbraco.Web.WebApi.Filters; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; +using Umbraco.Web.Composing; using IUser = Umbraco.Core.Models.Membership.IUser; namespace Umbraco.Web.Editors diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs index 2d40daf16e..149638aeca 100644 --- a/src/Umbraco.Web/Editors/BackOfficeController.cs +++ b/src/Umbraco.Web/Editors/BackOfficeController.cs @@ -36,6 +36,7 @@ using Umbraco.Web.Trees; using Umbraco.Web.UI.JavaScript; using Umbraco.Web.WebServices; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Security; using Action = Umbraco.Web._Legacy.Actions.Action; using Constants = Umbraco.Core.Constants; diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs index b0bd3da58b..c6a5fab852 100644 --- a/src/Umbraco.Web/Editors/CodeFileController.cs +++ b/src/Umbraco.Web/Editors/CodeFileController.cs @@ -11,6 +11,7 @@ using Umbraco.Core; using Umbraco.Core.IO; using Umbraco.Core.Models; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi; diff --git a/src/Umbraco.Web/Editors/ContentControllerBase.cs b/src/Umbraco.Web/Editors/ContentControllerBase.cs index 2b42e33c45..7921e85029 100644 --- a/src/Umbraco.Web/Editors/ContentControllerBase.cs +++ b/src/Umbraco.Web/Editors/ContentControllerBase.cs @@ -9,6 +9,7 @@ using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Models.Editors; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.WebApi; using Umbraco.Web.WebApi.Filters; diff --git a/src/Umbraco.Web/Editors/ContentPostValidateAttribute.cs b/src/Umbraco.Web/Editors/ContentPostValidateAttribute.cs index ca4554d199..12a1c6a304 100644 --- a/src/Umbraco.Web/Editors/ContentPostValidateAttribute.cs +++ b/src/Umbraco.Web/Editors/ContentPostValidateAttribute.cs @@ -7,6 +7,7 @@ using System.Web.Http.Filters; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Security; using Umbraco.Web.WebApi; diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs index 567af27b96..1a849ace93 100644 --- a/src/Umbraco.Web/Editors/ContentTypeController.cs +++ b/src/Umbraco.Web/Editors/ContentTypeController.cs @@ -13,6 +13,7 @@ using Umbraco.Core; using Umbraco.Web.WebApi; using Umbraco.Web.WebApi.Filters; using Umbraco.Core.Logging; +using Umbraco.Web.Composing; namespace Umbraco.Web.Editors { diff --git a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs index d9fc85394a..3eedfc2c44 100644 --- a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs +++ b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs @@ -11,6 +11,7 @@ using Umbraco.Core.Dictionary; using Umbraco.Core.Exceptions; using Umbraco.Core.Models; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi; diff --git a/src/Umbraco.Web/Editors/DataTypeController.cs b/src/Umbraco.Web/Editors/DataTypeController.cs index 055636bb14..be016d1808 100644 --- a/src/Umbraco.Web/Editors/DataTypeController.cs +++ b/src/Umbraco.Web/Editors/DataTypeController.cs @@ -16,6 +16,7 @@ using Umbraco.Web.WebApi.Filters; using Constants = Umbraco.Core.Constants; using System.Net.Http; using System.Text; +using Umbraco.Web.Composing; namespace Umbraco.Web.Editors { diff --git a/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs b/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs index 6d885a3863..bb9aebbadd 100644 --- a/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs +++ b/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs @@ -11,6 +11,7 @@ using Umbraco.Core.Models; using Umbraco.Core.Models.EntityBase; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.WebApi; diff --git a/src/Umbraco.Web/Editors/MediaPostValidateAttribute.cs b/src/Umbraco.Web/Editors/MediaPostValidateAttribute.cs index dc68445253..8701f7fcf0 100644 --- a/src/Umbraco.Web/Editors/MediaPostValidateAttribute.cs +++ b/src/Umbraco.Web/Editors/MediaPostValidateAttribute.cs @@ -7,6 +7,7 @@ using System.Web.Http.Filters; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Security; using Umbraco.Web.WebApi; diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs index 32bae9453f..049e143a57 100644 --- a/src/Umbraco.Web/Editors/MediaTypeController.cs +++ b/src/Umbraco.Web/Editors/MediaTypeController.cs @@ -16,6 +16,7 @@ using System; using System.ComponentModel; using System.Web.Http.Controllers; using Umbraco.Core; +using Umbraco.Web.Composing; namespace Umbraco.Web.Editors { diff --git a/src/Umbraco.Web/Editors/ValidationHelper.cs b/src/Umbraco.Web/Editors/ValidationHelper.cs index d451ca5e13..525e6ab9da 100644 --- a/src/Umbraco.Web/Editors/ValidationHelper.cs +++ b/src/Umbraco.Web/Editors/ValidationHelper.cs @@ -1,11 +1,10 @@ using System; using System.ComponentModel; using System.Linq; -using System.Web; using System.Web.Http.ModelBinding; using Umbraco.Core; using Umbraco.Core.Models.Validation; -using Umbraco.Web.Models.ContentEditing; +using Umbraco.Web.Composing; namespace Umbraco.Web.Editors { diff --git a/src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs b/src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs index a6c6ad0e7c..65a1ea828e 100644 --- a/src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs +++ b/src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs @@ -3,6 +3,7 @@ using System.IO; using System.Xml; using Umbraco.Core.Logging; using Umbraco.Core.Services; +using Umbraco.Web.Composing; namespace Umbraco.Web.HealthCheck.Checks.Config { diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckAction.cs b/src/Umbraco.Web/HealthCheck/HealthCheckAction.cs index 25d2b208ca..756bc4fbbe 100644 --- a/src/Umbraco.Web/HealthCheck/HealthCheckAction.cs +++ b/src/Umbraco.Web/HealthCheck/HealthCheckAction.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Runtime.Serialization; using Umbraco.Core.Services; +using Umbraco.Web.Composing; namespace Umbraco.Web.HealthCheck { diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs index e09956feb1..dc0758531e 100644 --- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs +++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs @@ -14,6 +14,7 @@ using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Profiling; +using Umbraco.Web.Composing; using Umbraco.Web.Models; using Umbraco.Web.Mvc; using Constants = Umbraco.Core.Constants; diff --git a/src/Umbraco.Web/HttpUrlHelperExtensions.cs b/src/Umbraco.Web/HttpUrlHelperExtensions.cs index efde0c0cf3..e4cfee9989 100644 --- a/src/Umbraco.Web/HttpUrlHelperExtensions.cs +++ b/src/Umbraco.Web/HttpUrlHelperExtensions.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Linq.Expressions; using System.Web.Http.Routing; using Umbraco.Core; +using Umbraco.Web.Composing; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi; diff --git a/src/Umbraco.Web/ImageCropperBaseExtensions.cs b/src/Umbraco.Web/ImageCropperBaseExtensions.cs index 394305e03b..870c0d1c3b 100644 --- a/src/Umbraco.Web/ImageCropperBaseExtensions.cs +++ b/src/Umbraco.Web/ImageCropperBaseExtensions.cs @@ -7,6 +7,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Umbraco.Core; using Umbraco.Core.Logging; +using Umbraco.Web.Composing; using Umbraco.Web.Models; namespace Umbraco.Web diff --git a/src/Umbraco.Web/Install/Controllers/InstallPackageController.cs b/src/Umbraco.Web/Install/Controllers/InstallPackageController.cs index cf6dd6d4de..a9f858cddd 100644 --- a/src/Umbraco.Web/Install/Controllers/InstallPackageController.cs +++ b/src/Umbraco.Web/Install/Controllers/InstallPackageController.cs @@ -10,6 +10,7 @@ using umbraco; using Umbraco.Core; using Umbraco.Web.Cache; using Umbraco.Core.Configuration; +using Umbraco.Web.Composing; using Umbraco.Web.Install.Models; using Umbraco.Web.WebApi; diff --git a/src/Umbraco.Web/Install/FilePermissionHelper.cs b/src/Umbraco.Web/Install/FilePermissionHelper.cs index 399edab0e6..099dee5ddb 100644 --- a/src/Umbraco.Web/Install/FilePermissionHelper.cs +++ b/src/Umbraco.Web/Install/FilePermissionHelper.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.IO; using Umbraco.Core.IO; +using Umbraco.Web.Composing; using Umbraco.Web.PublishedCache; namespace Umbraco.Web.Install diff --git a/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs b/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs index 5cb0d5cc9b..2ed4a9d903 100644 --- a/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs +++ b/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs @@ -3,6 +3,7 @@ using System.Web.Http; using System.Web.Http.Controllers; using Umbraco.Core; using Umbraco.Core.Logging; +using Umbraco.Web.Composing; namespace Umbraco.Web.Install { diff --git a/src/Umbraco.Web/Install/InstallAuthorizeAttribute.cs b/src/Umbraco.Web/Install/InstallAuthorizeAttribute.cs index 787b69a654..722c74c40f 100644 --- a/src/Umbraco.Web/Install/InstallAuthorizeAttribute.cs +++ b/src/Umbraco.Web/Install/InstallAuthorizeAttribute.cs @@ -3,6 +3,7 @@ using System.Web; using System.Web.Mvc; using Umbraco.Core; using Umbraco.Core.IO; +using Umbraco.Web.Composing; namespace Umbraco.Web.Install { diff --git a/src/Umbraco.Web/Install/InstallHelper.cs b/src/Umbraco.Web/Install/InstallHelper.cs index 55a719a62a..048f54fa74 100644 --- a/src/Umbraco.Web/Install/InstallHelper.cs +++ b/src/Umbraco.Web/Install/InstallHelper.cs @@ -11,6 +11,7 @@ using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.SqlSyntax; +using Umbraco.Web.Composing; using Umbraco.Web.Install.InstallSteps; using Umbraco.Web.Install.Models; diff --git a/src/Umbraco.Web/Install/InstallSteps/MajorVersion7UpgradeReport.cs b/src/Umbraco.Web/Install/InstallSteps/MajorVersion7UpgradeReport.cs index 0a199c8332..90ad55e51c 100644 --- a/src/Umbraco.Web/Install/InstallSteps/MajorVersion7UpgradeReport.cs +++ b/src/Umbraco.Web/Install/InstallSteps/MajorVersion7UpgradeReport.cs @@ -9,6 +9,7 @@ using Umbraco.Core.PropertyEditors; using Umbraco.Web.Install.Models; using Umbraco.Core.Scoping; using Umbraco.Core.Persistence.SqlSyntax; +using Umbraco.Web.Composing; namespace Umbraco.Web.Install.InstallSteps { diff --git a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs index 5481cce954..12b88340dc 100644 --- a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs @@ -3,6 +3,7 @@ using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; using Umbraco.Web.Cache; +using Umbraco.Web.Composing; using Umbraco.Web.Install.Models; using Umbraco.Web.Security; diff --git a/src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs b/src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs index 5996f8b1e9..5537f39dc9 100644 --- a/src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs @@ -5,6 +5,7 @@ using System.Web; using umbraco.cms.businesslogic.packager; using Umbraco.Core.Services; using Umbraco.Core.Configuration; +using Umbraco.Web.Composing; using Umbraco.Web.Install.Models; using Umbraco.Web.Security; diff --git a/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs index acbb80de96..b3ca1519d4 100644 --- a/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs @@ -2,6 +2,7 @@ using System; using System.Linq; using System.Web; using umbraco.cms.businesslogic.packager; +using Umbraco.Web.Composing; using Umbraco.Web.Install.Models; namespace Umbraco.Web.Install.InstallSteps diff --git a/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs b/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs index b2d19a0647..d0474d3773 100644 --- a/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs @@ -2,6 +2,7 @@ using System; using Semver; using Umbraco.Core; using Umbraco.Core.Configuration; +using Umbraco.Web.Composing; using Umbraco.Web.Install.Models; namespace Umbraco.Web.Install.InstallSteps diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs index 4bef75e7bb..782cf8b3c4 100644 --- a/src/Umbraco.Web/Macros/MacroRenderer.cs +++ b/src/Umbraco.Web/Macros/MacroRenderer.cs @@ -21,6 +21,7 @@ using Umbraco.Core.Logging; using Umbraco.Core.Macros; using Umbraco.Core.Models; using Umbraco.Core.Services; +using Umbraco.Web.Composing; namespace Umbraco.Web.Macros { diff --git a/src/Umbraco.Web/Macros/UserControlMacroEngine.cs b/src/Umbraco.Web/Macros/UserControlMacroEngine.cs index aba5abc02f..acdf2b69da 100644 --- a/src/Umbraco.Web/Macros/UserControlMacroEngine.cs +++ b/src/Umbraco.Web/Macros/UserControlMacroEngine.cs @@ -6,6 +6,7 @@ using umbraco; using Umbraco.Core; using Umbraco.Core.IO; using Umbraco.Core.Logging; +using Umbraco.Web.Composing; namespace Umbraco.Web.Macros { diff --git a/src/Umbraco.Web/Macros/XsltMacroEngine.cs b/src/Umbraco.Web/Macros/XsltMacroEngine.cs index 30d74d47af..9fa85d9bd6 100644 --- a/src/Umbraco.Web/Macros/XsltMacroEngine.cs +++ b/src/Umbraco.Web/Macros/XsltMacroEngine.cs @@ -18,6 +18,7 @@ using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Macros; using Umbraco.Core.Xml.XPath; +using Umbraco.Web.Composing; using Umbraco.Web.Templates; namespace Umbraco.Web.Macros diff --git a/src/Umbraco.Web/Media/ImageUrl.cs b/src/Umbraco.Web/Media/ImageUrl.cs index e141a39d4b..06db716914 100644 --- a/src/Umbraco.Web/Media/ImageUrl.cs +++ b/src/Umbraco.Web/Media/ImageUrl.cs @@ -8,6 +8,7 @@ using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Media; using umbraco; +using Umbraco.Web.Composing; namespace Umbraco.Web.Media { diff --git a/src/Umbraco.Web/Models/ContentExtensions.cs b/src/Umbraco.Web/Models/ContentExtensions.cs index 06ede1d2ae..b778cfc00e 100644 --- a/src/Umbraco.Web/Models/ContentExtensions.cs +++ b/src/Umbraco.Web/Models/ContentExtensions.cs @@ -5,6 +5,7 @@ using umbraco.cms.businesslogic.web; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Routing; using Domain = Umbraco.Web.Routing.Domain; diff --git a/src/Umbraco.Web/Models/Mapping/AvailablePropertyEditorsResolver.cs b/src/Umbraco.Web/Models/Mapping/AvailablePropertyEditorsResolver.cs index 5d4a782623..d26c88129d 100644 --- a/src/Umbraco.Web/Models/Mapping/AvailablePropertyEditorsResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/AvailablePropertyEditorsResolver.cs @@ -3,6 +3,7 @@ using System.Linq; using AutoMapper; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Models; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; namespace Umbraco.Web.Models.Mapping diff --git a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs index 2ff5d6876a..89aea7d099 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs @@ -10,6 +10,7 @@ using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.Mapping; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Trees; using Umbraco.Web.Routing; diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs index 82543f2620..89ff4756d0 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs @@ -5,6 +5,7 @@ using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; namespace Umbraco.Web.Models.Mapping diff --git a/src/Umbraco.Web/Models/Mapping/DataTypeModelMapper.cs b/src/Umbraco.Web/Models/Mapping/DataTypeModelMapper.cs index 1a83e837df..777d70e437 100644 --- a/src/Umbraco.Web/Models/Mapping/DataTypeModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/DataTypeModelMapper.cs @@ -8,6 +8,7 @@ using Umbraco.Core.Models; using Umbraco.Core.Models.Mapping; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; namespace Umbraco.Web.Models.Mapping diff --git a/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs b/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs index 57be0fc23f..73362b5030 100644 --- a/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs @@ -2,6 +2,7 @@ using AutoMapper; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; namespace Umbraco.Web.Models.Mapping diff --git a/src/Umbraco.Web/Models/Mapping/MacroModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MacroModelMapper.cs index b0358382fc..5d6eab8600 100644 --- a/src/Umbraco.Web/Models/Mapping/MacroModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/MacroModelMapper.cs @@ -5,6 +5,7 @@ using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Models.Mapping; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; namespace Umbraco.Web.Models.Mapping diff --git a/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs index 548dad7b4e..e590521192 100644 --- a/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs @@ -10,6 +10,7 @@ using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Models.Mapping; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Trees; diff --git a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs index 473ba8993b..c887614bb0 100644 --- a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs @@ -13,6 +13,7 @@ using Umbraco.Core.Services; using Umbraco.Web.Models.ContentEditing; using System.Linq; using Umbraco.Core.Security; +using Umbraco.Web.Composing; using Umbraco.Web.Trees; namespace Umbraco.Web.Models.Mapping diff --git a/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs b/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs index c96e5fbebc..0770bd2637 100644 --- a/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs @@ -7,6 +7,7 @@ using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; namespace Umbraco.Web.Models.Mapping diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs index ad69477741..cfee99ba5f 100644 --- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs @@ -8,6 +8,7 @@ using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; using Umbraco.Web.Models.ContentEditing; using umbraco; +using Umbraco.Web.Composing; namespace Umbraco.Web.Models.Mapping { diff --git a/src/Umbraco.Web/Models/PublishedProperty.cs b/src/Umbraco.Web/Models/PublishedProperty.cs index e39b704f6b..2ab288984a 100644 --- a/src/Umbraco.Web/Models/PublishedProperty.cs +++ b/src/Umbraco.Web/Models/PublishedProperty.cs @@ -5,6 +5,7 @@ using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.PropertyEditors; +using Umbraco.Web.Composing; namespace Umbraco.Web.Models { diff --git a/src/Umbraco.Web/Models/Trees/MenuItem.cs b/src/Umbraco.Web/Models/Trees/MenuItem.cs index f3373bda2e..6c7a886eb4 100644 --- a/src/Umbraco.Web/Models/Trees/MenuItem.cs +++ b/src/Umbraco.Web/Models/Trees/MenuItem.cs @@ -5,6 +5,7 @@ using Umbraco.Web.Trees; using System.Collections.Generic; using Umbraco.Core; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Models.Trees diff --git a/src/Umbraco.Web/Models/Trees/MenuItemList.cs b/src/Umbraco.Web/Models/Trees/MenuItemList.cs index 36d596817a..1f76f297e6 100644 --- a/src/Umbraco.Web/Models/Trees/MenuItemList.cs +++ b/src/Umbraco.Web/Models/Trees/MenuItemList.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using Umbraco.Core; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Models.Trees diff --git a/src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs b/src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs index c68fda38d4..f21b996037 100644 --- a/src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs +++ b/src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs @@ -7,6 +7,7 @@ using System.Web.Mvc; using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Services; +using Umbraco.Web.Composing; namespace Umbraco.Web.Mvc { diff --git a/src/Umbraco.Web/Mvc/ContentModelBinder.cs b/src/Umbraco.Web/Mvc/ContentModelBinder.cs index f4426f3fb8..cf55797050 100644 --- a/src/Umbraco.Web/Mvc/ContentModelBinder.cs +++ b/src/Umbraco.Web/Mvc/ContentModelBinder.cs @@ -6,6 +6,7 @@ using System.Web; using System.Web.Mvc; using Umbraco.Core; using Umbraco.Core.Models.PublishedContent; +using Umbraco.Web.Composing; using Umbraco.Web.Models; namespace Umbraco.Web.Mvc diff --git a/src/Umbraco.Web/Mvc/ControllerContextExtensions.cs b/src/Umbraco.Web/Mvc/ControllerContextExtensions.cs index c12aa51410..3dc78a15e2 100644 --- a/src/Umbraco.Web/Mvc/ControllerContextExtensions.cs +++ b/src/Umbraco.Web/Mvc/ControllerContextExtensions.cs @@ -1,4 +1,5 @@ using System.Web.Mvc; +using Umbraco.Web.Composing; namespace Umbraco.Web.Mvc { diff --git a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs index 86aac6413d..3d1c731818 100644 --- a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs +++ b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs @@ -4,6 +4,7 @@ using Umbraco.Web.Routing; using Umbraco.Core; using Umbraco.Core.Models.PublishedContent; using LightInject; +using Umbraco.Web.Composing; namespace Umbraco.Web.Mvc { diff --git a/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs b/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs index a9bfc34bad..c23bf77913 100644 --- a/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs +++ b/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs @@ -8,6 +8,7 @@ using Umbraco.Web.Security; using umbraco.cms.businesslogic.member; using AuthorizeAttribute = System.Web.Mvc.AuthorizeAttribute; using Umbraco.Core; +using Umbraco.Web.Composing; namespace Umbraco.Web.Mvc { diff --git a/src/Umbraco.Web/Mvc/ProfilingView.cs b/src/Umbraco.Web/Mvc/ProfilingView.cs index c7a31a7829..e6e1066636 100644 --- a/src/Umbraco.Web/Mvc/ProfilingView.cs +++ b/src/Umbraco.Web/Mvc/ProfilingView.cs @@ -2,6 +2,7 @@ using System.IO; using System.Web.Mvc; using Umbraco.Core.Logging; using Umbraco.Web; +using Umbraco.Web.Composing; namespace Umbraco.Core.Profiling { diff --git a/src/Umbraco.Web/Mvc/ProfilingViewEngine.cs b/src/Umbraco.Web/Mvc/ProfilingViewEngine.cs index 27ec66805a..3376b9c10c 100644 --- a/src/Umbraco.Web/Mvc/ProfilingViewEngine.cs +++ b/src/Umbraco.Web/Mvc/ProfilingViewEngine.cs @@ -1,6 +1,7 @@ using System.Web.Mvc; using Umbraco.Core.Logging; using Umbraco.Web; +using Umbraco.Web.Composing; namespace Umbraco.Core.Profiling { diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs index 11823fd155..b31fb91d69 100644 --- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs +++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs @@ -7,10 +7,11 @@ using System.Web.Routing; using System.Web.SessionState; using Umbraco.Core; using Umbraco.Core.Logging; +using Umbraco.Core.Composing; using Umbraco.Web.Models; using Umbraco.Web.Routing; using System.Collections.Generic; -using Umbraco.Core.Composing; +using Current = Umbraco.Web.Composing.Current; using LightInject; namespace Umbraco.Web.Mvc diff --git a/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs b/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs index 2ff090cfaa..c89863f376 100644 --- a/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs +++ b/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs @@ -2,6 +2,7 @@ using System.Web; using System.Web.Mvc; using Umbraco.Core; +using Umbraco.Web.Composing; namespace Umbraco.Web.Mvc { diff --git a/src/Umbraco.Web/Mvc/UmbracoControllerFactory.cs b/src/Umbraco.Web/Mvc/UmbracoControllerFactory.cs index fc1d4c568a..9a44c0a804 100644 --- a/src/Umbraco.Web/Mvc/UmbracoControllerFactory.cs +++ b/src/Umbraco.Web/Mvc/UmbracoControllerFactory.cs @@ -3,6 +3,7 @@ using System.Web.Mvc; using System.Web.Routing; using System.Web.SessionState; using Umbraco.Core; +using Umbraco.Web.Composing; namespace Umbraco.Web.Mvc { diff --git a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs index f1282c7464..f27f8cc2d6 100644 --- a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs +++ b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs @@ -6,6 +6,7 @@ using System.Web.Routing; using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Profiling; +using Umbraco.Web.Composing; namespace Umbraco.Web.Mvc { diff --git a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs index f3df6e40ca..1fd458066f 100644 --- a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs +++ b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs @@ -10,6 +10,7 @@ using Umbraco.Core.Configuration; using Umbraco.Core.IO; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Models; using Umbraco.Web.Routing; using Umbraco.Web.Security; diff --git a/src/Umbraco.Web/NotificationServiceExtensions.cs b/src/Umbraco.Web/NotificationServiceExtensions.cs index af51fe7aab..4b1ac5dd6c 100644 --- a/src/Umbraco.Web/NotificationServiceExtensions.cs +++ b/src/Umbraco.Web/NotificationServiceExtensions.cs @@ -9,6 +9,7 @@ using Umbraco.Core.Services; using Umbraco.Core.Models; using Umbraco.Web._Legacy.Actions; using System.Collections.Generic; +using Umbraco.Web.Composing; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/PropertyEditors/PublishValueValueEditor.cs b/src/Umbraco.Web/PropertyEditors/PublishValueValueEditor.cs index 5e83f54487..0d2a66fc88 100644 --- a/src/Umbraco.Web/PropertyEditors/PublishValueValueEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/PublishValueValueEditor.cs @@ -5,6 +5,7 @@ using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; +using Umbraco.Web.Composing; namespace Umbraco.Web.PropertyEditors { diff --git a/src/Umbraco.Web/PropertyEditors/PublishValuesMultipleValueEditor.cs b/src/Umbraco.Web/PropertyEditors/PublishValuesMultipleValueEditor.cs index edcc90cf8e..8d0ecb0e30 100644 --- a/src/Umbraco.Web/PropertyEditors/PublishValuesMultipleValueEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/PublishValuesMultipleValueEditor.cs @@ -6,6 +6,7 @@ using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; +using Umbraco.Web.Composing; namespace Umbraco.Web.PropertyEditors { diff --git a/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs b/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs index 10f3d20c39..2a20434d80 100644 --- a/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs +++ b/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs @@ -11,6 +11,7 @@ using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; using umbraco; using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Web.Composing; namespace Umbraco.Web.PropertyEditors { diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/Database.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/Database.cs index 54a3db3aee..03b545e6cf 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/Database.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/Database.cs @@ -7,6 +7,7 @@ using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Persistence.UnitOfWork; using Umbraco.Core.Serialization; +using Umbraco.Web.Composing; namespace Umbraco.Web.PublishedCache.NuCache.DataSource { diff --git a/src/Umbraco.Web/PublishedCache/NuCache/FacadeService.cs b/src/Umbraco.Web/PublishedCache/NuCache/FacadeService.cs index b40f8c627c..0b35f45336 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/FacadeService.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/FacadeService.cs @@ -23,6 +23,7 @@ using Umbraco.Core.Scoping; using Umbraco.Core.Services; using Umbraco.Core.Services.Changes; using Umbraco.Web.Cache; +using Umbraco.Web.Composing; using Umbraco.Web.Install; using Umbraco.Web.PublishedCache.NuCache.DataSource; using Umbraco.Web.PublishedCache.XmlPublishedCache; diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs index daff925e83..e93b76221c 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs @@ -4,6 +4,7 @@ using System.Linq; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Models.PublishedContent; +using Umbraco.Web.Composing; using Umbraco.Web.Models; using Umbraco.Web.PublishedCache.NuCache.DataSource; diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PreviewContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PreviewContent.cs index 5a42a8df1b..36b38b11ac 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PreviewContent.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PreviewContent.cs @@ -5,6 +5,7 @@ using System.Xml; using Umbraco.Core; using Umbraco.Core.IO; using Umbraco.Core.Logging; +using Umbraco.Web.Composing; namespace Umbraco.Web.PublishedCache.XmlPublishedCache { diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs index 8d077cb23f..42726e76fb 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs @@ -21,6 +21,7 @@ using UmbracoExamine; using umbraco; using Umbraco.Core.Cache; using Umbraco.Core.Services; +using Umbraco.Web.Composing; namespace Umbraco.Web.PublishedCache.XmlPublishedCache { @@ -258,7 +259,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache catch (AlreadyClosedException) { //If the app domain is shutting down and the site is under heavy load the index reader will be closed and it really cannot - //be re-opened since the app domain is shutting down. In this case we have no option but to try to load the data from the db. + //be re-opened since the app domain is shutting down. In this case we have no option but to try to load the data from the db. } return null; } diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs index 8fc121c30b..a9a416d5a5 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs @@ -8,6 +8,7 @@ using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Configuration; using Umbraco.Core.Models.PublishedContent; +using Umbraco.Web.Composing; using Umbraco.Web.Models; namespace Umbraco.Web.PublishedCache.XmlPublishedCache diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs index d02332ef04..ba87e92060 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs @@ -23,6 +23,7 @@ using Umbraco.Core.Services.Changes; using Umbraco.Core.Strings; using Umbraco.Core.Xml; using Umbraco.Web.Cache; +using Umbraco.Web.Composing; using Umbraco.Web.Scheduling; using Content = umbraco.cms.businesslogic.Content; using File = System.IO.File; diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs index d1e82d287e..e85e3cec7b 100644 --- a/src/Umbraco.Web/PublishedContentExtensions.cs +++ b/src/Umbraco.Web/PublishedContentExtensions.cs @@ -10,6 +10,7 @@ using Umbraco.Web.Models; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Services; +using Umbraco.Web.Composing; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/Routing/AliasUrlProvider.cs b/src/Umbraco.Web/Routing/AliasUrlProvider.cs index c1661ae838..9215719712 100644 --- a/src/Umbraco.Web/Routing/AliasUrlProvider.cs +++ b/src/Umbraco.Web/Routing/AliasUrlProvider.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Core; +using Umbraco.Web.Composing; using Umbraco.Web.PublishedCache; namespace Umbraco.Web.Routing diff --git a/src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs b/src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs index 61bcbdb4fa..69fd949124 100644 --- a/src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs +++ b/src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs @@ -3,6 +3,7 @@ using Umbraco.Core.Models; using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.Models.PublishedContent; +using Umbraco.Web.Composing; namespace Umbraco.Web.Routing { diff --git a/src/Umbraco.Web/Routing/DomainHelper.cs b/src/Umbraco.Web/Routing/DomainHelper.cs index 8b9a1dd860..517f01d8d0 100644 --- a/src/Umbraco.Web/Routing/DomainHelper.cs +++ b/src/Umbraco.Web/Routing/DomainHelper.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Core; +using Umbraco.Web.Composing; using Umbraco.Web.PublishedCache; // Facade namespace Umbraco.Web.Routing diff --git a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs index 7a9ed2cafd..9415a7f725 100644 --- a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs +++ b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs @@ -7,6 +7,7 @@ using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Core.Xml; +using Umbraco.Web.Composing; namespace Umbraco.Web.Routing { diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs index 675d4ca2f3..1baf69bb60 100644 --- a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs +++ b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs @@ -8,6 +8,7 @@ using Umbraco.Core.Cache; using Umbraco.Core.Components; using Umbraco.Core.Sync; using Umbraco.Web.Cache; +using Umbraco.Web.Composing; namespace Umbraco.Web.Redirects { diff --git a/src/Umbraco.Web/Routing/UrlProvider.cs b/src/Umbraco.Web/Routing/UrlProvider.cs index cbb7e8bd30..0dfac6bbfb 100644 --- a/src/Umbraco.Web/Routing/UrlProvider.cs +++ b/src/Umbraco.Web/Routing/UrlProvider.cs @@ -6,6 +6,7 @@ using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Web.PublishedCache; using Umbraco.Core; using Umbraco.Core.Models; +using Umbraco.Web.Composing; namespace Umbraco.Web.Routing { diff --git a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs index 6f3a950017..feb30e9624 100644 --- a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs +++ b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs @@ -5,6 +5,7 @@ using Umbraco.Core.Services; using Umbraco.Core; using Umbraco.Core.Logging; using LightInject; +using Umbraco.Web.Composing; namespace Umbraco.Web.Routing { diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs index d08d87a32a..6bd116467e 100644 --- a/src/Umbraco.Web/Search/ExamineComponent.cs +++ b/src/Umbraco.Web/Search/ExamineComponent.cs @@ -18,6 +18,7 @@ using Umbraco.Core.Services; using Umbraco.Core.Services.Changes; using Umbraco.Core.Sync; using Umbraco.Web.Cache; +using Umbraco.Web.Composing; using Umbraco.Web.PropertyEditors; using UmbracoExamine; diff --git a/src/Umbraco.Web/Search/LuceneIndexerExtensions.cs b/src/Umbraco.Web/Search/LuceneIndexerExtensions.cs index 9438d2937c..99c319cee2 100644 --- a/src/Umbraco.Web/Search/LuceneIndexerExtensions.cs +++ b/src/Umbraco.Web/Search/LuceneIndexerExtensions.cs @@ -7,6 +7,7 @@ using Lucene.Net.Index; using Lucene.Net.Search; using Lucene.Net.Store; using Umbraco.Core.Logging; +using Umbraco.Web.Composing; namespace Umbraco.Web.Search { diff --git a/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs index c132933970..bbfc9e1e21 100644 --- a/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs +++ b/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs @@ -14,6 +14,7 @@ using Umbraco.Core.Configuration; using Umbraco.Core.Models.Identity; using Umbraco.Core.Security; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Constants = Umbraco.Core.Constants; namespace Umbraco.Web.Security.Identity diff --git a/src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs b/src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs index 79f4caf5f9..6537159915 100644 --- a/src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs +++ b/src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs @@ -5,6 +5,7 @@ using Microsoft.Owin.Security.Cookies; using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Web.Composing; namespace Umbraco.Web.Security.Identity { diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs index 76721223ed..43467f06c9 100644 --- a/src/Umbraco.Web/Security/MembershipHelper.cs +++ b/src/Umbraco.Web/Security/MembershipHelper.cs @@ -14,6 +14,7 @@ using Umbraco.Web.PublishedCache; using Umbraco.Core.Cache; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Security.Providers; using MPE = global::Umbraco.Core.Security.MembershipProviderExtensions; diff --git a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs index 11a7062053..9854e9e94a 100644 --- a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs +++ b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs @@ -12,6 +12,7 @@ using Umbraco.Core.Models.EntityBase; using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Core.Models.Membership; +using Umbraco.Web.Composing; namespace Umbraco.Web.Security.Providers { diff --git a/src/Umbraco.Web/Security/Providers/MembersRoleProvider.cs b/src/Umbraco.Web/Security/Providers/MembersRoleProvider.cs index 8dda8078d2..1173e2b249 100644 --- a/src/Umbraco.Web/Security/Providers/MembersRoleProvider.cs +++ b/src/Umbraco.Web/Security/Providers/MembersRoleProvider.cs @@ -6,6 +6,7 @@ using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Services; +using Umbraco.Web.Composing; namespace Umbraco.Web.Security.Providers { diff --git a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs index 7ff6afffe6..bd5aff997b 100644 --- a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs +++ b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs @@ -12,6 +12,7 @@ using Umbraco.Core.Models.Membership; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Security; using Umbraco.Core.Services; +using Umbraco.Web.Composing; namespace Umbraco.Web.Security.Providers { diff --git a/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs index 041acdd036..6aa9080d6a 100644 --- a/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs +++ b/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs @@ -8,6 +8,7 @@ using Umbraco.Core.Configuration; using Umbraco.Core.Models.Membership; using Umbraco.Core.Security; using Umbraco.Core.Services; +using Umbraco.Web.Composing; namespace Umbraco.Web.Security.Providers { diff --git a/src/Umbraco.Web/Security/WebSecurity.cs b/src/Umbraco.Web/Security/WebSecurity.cs index 3b2870e380..d2d6246d5f 100644 --- a/src/Umbraco.Web/Security/WebSecurity.cs +++ b/src/Umbraco.Web/Security/WebSecurity.cs @@ -13,6 +13,7 @@ using Umbraco.Core.Security; using Microsoft.AspNet.Identity.Owin; using Microsoft.Owin; using Umbraco.Core.Models.Identity; +using Umbraco.Web.Composing; using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings; namespace Umbraco.Web.Security diff --git a/src/Umbraco.Web/Strategies/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Web/Strategies/DatabaseServerRegistrarAndMessengerComponent.cs index 4ffd09364b..130ad6b0b3 100644 --- a/src/Umbraco.Web/Strategies/DatabaseServerRegistrarAndMessengerComponent.cs +++ b/src/Umbraco.Web/Strategies/DatabaseServerRegistrarAndMessengerComponent.cs @@ -18,6 +18,7 @@ using Umbraco.Web.Routing; using Umbraco.Web.Scheduling; using LightInject; using Umbraco.Core.Exceptions; +using Umbraco.Web.Composing; namespace Umbraco.Web.Strategies { diff --git a/src/Umbraco.Web/Strategies/Migrations/RebuildXmlCachesAfterUpgrade.cs b/src/Umbraco.Web/Strategies/Migrations/RebuildXmlCachesAfterUpgrade.cs index 9e76abf2ad..3461fc34df 100644 --- a/src/Umbraco.Web/Strategies/Migrations/RebuildXmlCachesAfterUpgrade.cs +++ b/src/Umbraco.Web/Strategies/Migrations/RebuildXmlCachesAfterUpgrade.cs @@ -4,6 +4,7 @@ using Umbraco.Core; using Umbraco.Core.Events; using Umbraco.Core.Persistence.Migrations; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.PublishedCache.XmlPublishedCache; using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings; diff --git a/src/Umbraco.Web/Strategies/PublicAccessComponent.cs b/src/Umbraco.Web/Strategies/PublicAccessComponent.cs index b8443f7730..a251009165 100644 --- a/src/Umbraco.Web/Strategies/PublicAccessComponent.cs +++ b/src/Umbraco.Web/Strategies/PublicAccessComponent.cs @@ -1,6 +1,7 @@ using Umbraco.Core; using Umbraco.Core.Components; using Umbraco.Core.Services; +using Umbraco.Web.Composing; namespace Umbraco.Web.Strategies { diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs index 3ee32ec7fa..1c8d4ef9f2 100644 --- a/src/Umbraco.Web/Templates/TemplateRenderer.cs +++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs @@ -14,6 +14,7 @@ using umbraco.cms.businesslogic.language; using Umbraco.Core.Configuration; using Umbraco.Core.Services; using LightInject; +using Umbraco.Web.Composing; namespace Umbraco.Web.Templates { diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs index 5b70f49fe3..422e3deedf 100644 --- a/src/Umbraco.Web/Templates/TemplateUtilities.cs +++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs @@ -4,6 +4,7 @@ using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.IO; using Umbraco.Core.Logging; +using Umbraco.Web.Composing; using Umbraco.Web.Routing; namespace Umbraco.Web.Templates diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs index b60d2d64d8..d691ca040c 100644 --- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs +++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using System.Web.Http; using Umbraco.Core.Models; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Models.Trees; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi; diff --git a/src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs b/src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs index ae797f1f32..ac96b2a188 100644 --- a/src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs +++ b/src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs @@ -19,15 +19,14 @@ using Umbraco.Web.WebApi; using umbraco.BusinessLogic; using umbraco.cms.presentation.Trees; using Umbraco.Core.Composing; +using Current = Umbraco.Web.Composing.Current; using ApplicationTree = Umbraco.Core.Models.ApplicationTree; -using IAuthorizationFilter = System.Web.Http.Filters.IAuthorizationFilter; using UrlHelper = System.Web.Http.Routing.UrlHelper; namespace Umbraco.Web.Trees { internal static class ApplicationTreeExtensions { - internal static Attempt TryGetControllerTree(this ApplicationTree appTree) { //get reference to all TreeApiControllers diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs index 640a9e5307..133b257713 100644 --- a/src/Umbraco.Web/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTreeController.cs @@ -7,6 +7,7 @@ using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.EntityBase; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Models.Trees; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi.Filters; diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs index c980958b78..f487f792a6 100644 --- a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs +++ b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs @@ -15,6 +15,7 @@ using umbraco; using umbraco.cms.presentation.Trees; using umbraco.controls.Tree; using Umbraco.Core.Models; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Trees diff --git a/src/Umbraco.Web/Trees/LegacyTreeJavascript.cs b/src/Umbraco.Web/Trees/LegacyTreeJavascript.cs index 24bc084d3d..12310aea09 100644 --- a/src/Umbraco.Web/Trees/LegacyTreeJavascript.cs +++ b/src/Umbraco.Web/Trees/LegacyTreeJavascript.cs @@ -5,6 +5,7 @@ using System.Text; using Umbraco.Core; using Umbraco.Core.Logging; using umbraco.cms.presentation.Trees; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Trees diff --git a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs index e26cf544ef..abefd5154d 100644 --- a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs +++ b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs @@ -1,5 +1,6 @@ using Umbraco.Core.IO; using Umbraco.Core; +using Umbraco.Web.Composing; using Umbraco.Web.Models.Trees; namespace Umbraco.Web.Trees diff --git a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs index 64ac6d447f..965537fccd 100644 --- a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs +++ b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs @@ -1,5 +1,6 @@ using Umbraco.Core; using Umbraco.Core.IO; +using Umbraco.Web.Composing; using Umbraco.Web.Models.Trees; namespace Umbraco.Web.Trees diff --git a/src/Umbraco.Web/Trees/ScriptsTreeController.cs b/src/Umbraco.Web/Trees/ScriptsTreeController.cs index 31c487fc68..adab7b5c4c 100644 --- a/src/Umbraco.Web/Trees/ScriptsTreeController.cs +++ b/src/Umbraco.Web/Trees/ScriptsTreeController.cs @@ -1,6 +1,7 @@ using System; using Umbraco.Core; using Umbraco.Core.IO; +using Umbraco.Web.Composing; using Umbraco.Web.Models.Trees; namespace Umbraco.Web.Trees diff --git a/src/Umbraco.Web/Trees/StylesheetsTreeController.cs b/src/Umbraco.Web/Trees/StylesheetsTreeController.cs index f6f19ab326..f044d7ea60 100644 --- a/src/Umbraco.Web/Trees/StylesheetsTreeController.cs +++ b/src/Umbraco.Web/Trees/StylesheetsTreeController.cs @@ -1,5 +1,6 @@ using Umbraco.Core; using Umbraco.Core.IO; +using Umbraco.Web.Composing; namespace Umbraco.Web.Trees { diff --git a/src/Umbraco.Web/Trees/XsltTreeController.cs b/src/Umbraco.Web/Trees/XsltTreeController.cs index c5584cc09d..185ec4a192 100644 --- a/src/Umbraco.Web/Trees/XsltTreeController.cs +++ b/src/Umbraco.Web/Trees/XsltTreeController.cs @@ -2,6 +2,7 @@ using System.IO; using Umbraco.Core; using Umbraco.Core.IO; +using Umbraco.Web.Composing; using Umbraco.Web.Models.Trees; namespace Umbraco.Web.Trees diff --git a/src/Umbraco.Web/UI/CdfLogger.cs b/src/Umbraco.Web/UI/CdfLogger.cs index f4924d99f1..99b45c8057 100644 --- a/src/Umbraco.Web/UI/CdfLogger.cs +++ b/src/Umbraco.Web/UI/CdfLogger.cs @@ -1,5 +1,6 @@ using System; using Umbraco.Core.Logging; +using Umbraco.Web.Composing; using ICdfLogger = ClientDependency.Core.Logging.ILogger; using ICoreLogger = Umbraco.Core.Logging.ILogger; diff --git a/src/Umbraco.Web/UI/Controls/InsertMacroSplitButton.cs b/src/Umbraco.Web/UI/Controls/InsertMacroSplitButton.cs index 3c4dc48e16..3da45d85b1 100644 --- a/src/Umbraco.Web/UI/Controls/InsertMacroSplitButton.cs +++ b/src/Umbraco.Web/UI/Controls/InsertMacroSplitButton.cs @@ -11,6 +11,7 @@ using Umbraco.Core.IO; using Umbraco.Core.Models; using Umbraco.Core.Models.Rdbms; using umbraco.DataLayer; +using Umbraco.Web.Composing; namespace Umbraco.Web.UI.Controls { diff --git a/src/Umbraco.Web/UI/Controls/UmbracoControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoControl.cs index 7d052ca17a..6ef6f70291 100644 --- a/src/Umbraco.Web/UI/Controls/UmbracoControl.cs +++ b/src/Umbraco.Web/UI/Controls/UmbracoControl.cs @@ -5,6 +5,7 @@ using Umbraco.Core.Cache; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; using Umbraco.Core.Services; +using Umbraco.Web.Composing; namespace Umbraco.Web.UI.Controls { diff --git a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs index 89297a7d6b..1872b4a4ff 100644 --- a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs +++ b/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs @@ -8,6 +8,7 @@ using Umbraco.Core.Cache; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Security; using Umbraco.Web.UI.Pages; diff --git a/src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs b/src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs index 342cf993b0..73d2f46c41 100644 --- a/src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs +++ b/src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs @@ -8,6 +8,7 @@ using ClientDependency.Core; using ClientDependency.Core.Config; using Newtonsoft.Json.Linq; using Umbraco.Core.PropertyEditors; +using Umbraco.Web.Composing; using Umbraco.Web.PropertyEditors; namespace Umbraco.Web.UI.JavaScript diff --git a/src/Umbraco.Web/UI/Pages/BasePage.cs b/src/Umbraco.Web/UI/Pages/BasePage.cs index 2cc4421924..a3bd83613f 100644 --- a/src/Umbraco.Web/UI/Pages/BasePage.cs +++ b/src/Umbraco.Web/UI/Pages/BasePage.cs @@ -9,6 +9,7 @@ using Umbraco.Core.Services; using Umbraco.Web.Security; using System.Web.UI; using Umbraco.Core.Persistence; +using Umbraco.Web.Composing; namespace Umbraco.Web.UI.Pages { diff --git a/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs b/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs index 30f0ed33bf..c0735ef27e 100644 --- a/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs +++ b/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs @@ -6,6 +6,7 @@ using Umbraco.Core.Logging; using umbraco.BusinessLogic; using Umbraco.Core; using Umbraco.Core.Security; +using Umbraco.Web.Composing; namespace Umbraco.Web.UI.Pages { diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 38449d192e..7f4bd1a519 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -60,7 +60,8 @@ - + + @@ -129,7 +130,7 @@ - + diff --git a/src/Umbraco.Web/UmbracoComponentRenderer.cs b/src/Umbraco.Web/UmbracoComponentRenderer.cs index 34408fd973..5ce2c1d2a0 100644 --- a/src/Umbraco.Web/UmbracoComponentRenderer.cs +++ b/src/Umbraco.Web/UmbracoComponentRenderer.cs @@ -11,6 +11,7 @@ using umbraco; using System.Collections.Generic; using umbraco.presentation.templateControls; using Umbraco.Core.Models.PublishedContent; +using Umbraco.Web.Composing; using Umbraco.Web.Macros; namespace Umbraco.Web diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs index 441a0443a9..2bc796d5c8 100644 --- a/src/Umbraco.Web/UmbracoContext.cs +++ b/src/Umbraco.Web/UmbracoContext.cs @@ -134,7 +134,7 @@ namespace Umbraco.Web /// Gets the current Umbraco Context. /// // note: obsolete, use Current.UmbracoContext... then obsolete Current too, and inject! - public static UmbracoContext Current => Web.Current.UmbracoContext; + public static UmbracoContext Current => Composing.Current.UmbracoContext; /// /// This is used internally for performance calculations, the ObjectCreated DateTime is set as soon as this @@ -308,7 +308,7 @@ namespace Umbraco.Web // reset - important when running outside of http context // also takes care of the accessor - Web.Current.ClearUmbracoContext(); + Composing.Current.ClearUmbracoContext(); // help caches release resources // (but don't create caches just to dispose them) diff --git a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs index c29185cd88..a8c08fcaa3 100644 --- a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs +++ b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs @@ -5,6 +5,7 @@ using Umbraco.Core; using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.Security.Identity; [assembly: OwinStartup("UmbracoDefaultOwinStartup", typeof(UmbracoDefaultOwinStartup))] diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index f6ec1e322f..68619a3c99 100644 --- a/src/Umbraco.Web/UmbracoHelper.cs +++ b/src/Umbraco.Web/UmbracoHelper.cs @@ -17,6 +17,7 @@ using System.Web.Mvc; using Umbraco.Core.Cache; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; +using Umbraco.Web.Composing; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs index 392f335e07..78ed5d3a58 100644 --- a/src/Umbraco.Web/UmbracoModule.cs +++ b/src/Umbraco.Web/UmbracoModule.cs @@ -15,6 +15,7 @@ using Umbraco.Core.Collections; using Umbraco.Core.Exceptions; using Umbraco.Core.Persistence; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.PublishedCache; using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings; diff --git a/src/Umbraco.Web/UrlHelperExtensions.cs b/src/Umbraco.Web/UrlHelperExtensions.cs index e196e0fc52..dd381658ae 100644 --- a/src/Umbraco.Web/UrlHelperExtensions.cs +++ b/src/Umbraco.Web/UrlHelperExtensions.cs @@ -8,6 +8,7 @@ using System.Web.Routing; using ClientDependency.Core.Config; using Umbraco.Core; using Umbraco.Core.Configuration; +using Umbraco.Web.Composing; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi; using Umbraco.Web.WebServices; diff --git a/src/Umbraco.Web/UrlHelperRenderExtensions.cs b/src/Umbraco.Web/UrlHelperRenderExtensions.cs index be70d768ee..ef923d1465 100644 --- a/src/Umbraco.Web/UrlHelperRenderExtensions.cs +++ b/src/Umbraco.Web/UrlHelperRenderExtensions.cs @@ -5,6 +5,7 @@ using System.Web.Mvc; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; +using Umbraco.Web.Composing; using Umbraco.Web.Models; using Umbraco.Web.Mvc; diff --git a/src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs b/src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs index 1d7db6a849..57db9bb43b 100644 --- a/src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs +++ b/src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs @@ -19,6 +19,7 @@ using Umbraco.Core; using Umbraco.Core.IO; using Umbraco.Core.Models; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Editors; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.PublishedCache; diff --git a/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs b/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs index d1262bb657..684aaee5c0 100644 --- a/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs +++ b/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs @@ -7,6 +7,7 @@ using System.Net.Http.Headers; using System.Web.Helpers; using Umbraco.Core; using Umbraco.Core.Logging; +using Umbraco.Web.Composing; namespace Umbraco.Web.WebApi.Filters { diff --git a/src/Umbraco.Web/WebApi/Filters/AppendCurrentEventMessagesAttribute.cs b/src/Umbraco.Web/WebApi/Filters/AppendCurrentEventMessagesAttribute.cs index a99414f87a..08ad0e3005 100644 --- a/src/Umbraco.Web/WebApi/Filters/AppendCurrentEventMessagesAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/AppendCurrentEventMessagesAttribute.cs @@ -2,6 +2,7 @@ using System; using System.Net.Http; using System.Web.Http.Filters; using Umbraco.Core.Events; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.UI; diff --git a/src/Umbraco.Web/WebApi/Filters/ContentItemValidationHelper.cs b/src/Umbraco.Web/WebApi/Filters/ContentItemValidationHelper.cs index adcb56f6d1..47846a32d4 100644 --- a/src/Umbraco.Web/WebApi/Filters/ContentItemValidationHelper.cs +++ b/src/Umbraco.Web/WebApi/Filters/ContentItemValidationHelper.cs @@ -9,6 +9,7 @@ using System.Web.Http.ModelBinding; using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Models; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; namespace Umbraco.Web.WebApi.Filters diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs index 63c27a77b9..b9a426e253 100644 --- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs @@ -10,6 +10,7 @@ using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Editors; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web._Legacy.Actions; diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs index 29102ac1fd..f99f1cb32f 100644 --- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs @@ -7,6 +7,7 @@ using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Editors; namespace Umbraco.Web.WebApi.Filters diff --git a/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs index 3236d80b33..b454fd1fa1 100644 --- a/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs @@ -7,6 +7,7 @@ using System.Web.Http.Filters; using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Models; +using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; using File = System.IO.File; diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs index 197aeafbfa..84489e972a 100644 --- a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs @@ -7,6 +7,7 @@ using System.Reflection; using Umbraco.Core.Models.Membership; using Umbraco.Core.Services; using Umbraco.Core; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.WebApi.Filters diff --git a/src/Umbraco.Web/WebApi/Filters/LegacyTreeAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/Filters/LegacyTreeAuthorizeAttribute.cs index aa641dfa18..f8f4fbbe9b 100644 --- a/src/Umbraco.Web/WebApi/Filters/LegacyTreeAuthorizeAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/LegacyTreeAuthorizeAttribute.cs @@ -1,6 +1,7 @@ using System.Web.Http; using System.Web.Http.Controllers; using Umbraco.Core; +using Umbraco.Web.Composing; namespace Umbraco.Web.WebApi.Filters { diff --git a/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs index 54cba655b9..0bf6306a52 100644 --- a/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs @@ -1,6 +1,7 @@ using System.Linq; using System.Web.Http; using System.Web.Http.Controllers; +using Umbraco.Web.Composing; namespace Umbraco.Web.WebApi.Filters { diff --git a/src/Umbraco.Web/WebApi/Filters/UmbracoTreeAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/Filters/UmbracoTreeAuthorizeAttribute.cs index 02d1d5c287..4904dc7a1b 100644 --- a/src/Umbraco.Web/WebApi/Filters/UmbracoTreeAuthorizeAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/UmbracoTreeAuthorizeAttribute.cs @@ -2,6 +2,7 @@ using System.Web.Http.Controllers; using System.Web.Http.Filters; using Umbraco.Core; +using Umbraco.Web.Composing; namespace Umbraco.Web.WebApi.Filters { diff --git a/src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs index f05240bea0..46e6f084b2 100644 --- a/src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs +++ b/src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs @@ -1,6 +1,7 @@ using System; using System.Web.Http; using Umbraco.Core; +using Umbraco.Web.Composing; namespace Umbraco.Web.WebApi { diff --git a/src/Umbraco.Web/WebRuntimeComponent.cs b/src/Umbraco.Web/WebRuntimeComponent.cs index 9ab997ee07..2e66e15e8b 100644 --- a/src/Umbraco.Web/WebRuntimeComponent.cs +++ b/src/Umbraco.Web/WebRuntimeComponent.cs @@ -41,6 +41,7 @@ using Umbraco.Web.UI.JavaScript; using Umbraco.Web.WebApi; using Umbraco.Web._Legacy.Actions; using UmbracoExamine; +using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/WebServices/CoreStringsController.cs b/src/Umbraco.Web/WebServices/CoreStringsController.cs index 4ca7973c94..9fb27a0bc1 100644 --- a/src/Umbraco.Web/WebServices/CoreStringsController.cs +++ b/src/Umbraco.Web/WebServices/CoreStringsController.cs @@ -1,6 +1,7 @@ using System.Web.Mvc; using Umbraco.Core; using Umbraco.Core.Strings; +using Umbraco.Web.Composing; using Umbraco.Web.Mvc; namespace Umbraco.Web.WebServices diff --git a/src/Umbraco.Web/WebServices/UmbracoHttpHandler.cs b/src/Umbraco.Web/WebServices/UmbracoHttpHandler.cs index 06807856c3..86b6bf49db 100644 --- a/src/Umbraco.Web/WebServices/UmbracoHttpHandler.cs +++ b/src/Umbraco.Web/WebServices/UmbracoHttpHandler.cs @@ -7,6 +7,7 @@ using Umbraco.Core.Cache; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Security; namespace Umbraco.Web.WebServices diff --git a/src/Umbraco.Web/WebServices/UmbracoWebService.cs b/src/Umbraco.Web/WebServices/UmbracoWebService.cs index 7b35821edc..08d33845dc 100644 --- a/src/Umbraco.Web/WebServices/UmbracoWebService.cs +++ b/src/Umbraco.Web/WebServices/UmbracoWebService.cs @@ -8,6 +8,7 @@ using Umbraco.Core.Cache; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; using Umbraco.Core.Services; +using Umbraco.Web.Composing; using Umbraco.Web.Security; namespace Umbraco.Web.WebServices diff --git a/src/Umbraco.Web/_Legacy/Actions/Action.cs b/src/Umbraco.Web/_Legacy/Actions/Action.cs index 89dc7e435f..2df788bef8 100644 --- a/src/Umbraco.Web/_Legacy/Actions/Action.cs +++ b/src/Umbraco.Web/_Legacy/Actions/Action.cs @@ -2,12 +2,10 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Models.Membership; -using Umbraco.Core.Composing; +using Umbraco.Web.Composing; using Umbraco.Core.Services; -using TypeFinder = Umbraco.Core.Composing.TypeFinder; namespace Umbraco.Web._Legacy.Actions { diff --git a/src/Umbraco.Web/_Legacy/PackageActions/addApplication.cs b/src/Umbraco.Web/_Legacy/PackageActions/addApplication.cs index a360ee0f4f..f99552a5ca 100644 --- a/src/Umbraco.Web/_Legacy/PackageActions/addApplication.cs +++ b/src/Umbraco.Web/_Legacy/PackageActions/addApplication.cs @@ -2,6 +2,7 @@ using System; using System.Xml; using Umbraco.Core; using Umbraco.Core._Legacy.PackageActions; +using Umbraco.Web.Composing; namespace Umbraco.Web._Legacy.PackageActions { diff --git a/src/Umbraco.Web/_Legacy/PackageActions/addApplicationTree.cs b/src/Umbraco.Web/_Legacy/PackageActions/addApplicationTree.cs index 8df4fed628..b83cb964c2 100644 --- a/src/Umbraco.Web/_Legacy/PackageActions/addApplicationTree.cs +++ b/src/Umbraco.Web/_Legacy/PackageActions/addApplicationTree.cs @@ -1,6 +1,7 @@ using System.Xml; using Umbraco.Core; using Umbraco.Core._Legacy.PackageActions; +using Umbraco.Web.Composing; namespace Umbraco.Web._Legacy.PackageActions { diff --git a/src/Umbraco.Web/_Legacy/PackageActions/addStringToHtmlElement.cs b/src/Umbraco.Web/_Legacy/PackageActions/addStringToHtmlElement.cs index 36073bb574..39f443fc63 100644 --- a/src/Umbraco.Web/_Legacy/PackageActions/addStringToHtmlElement.cs +++ b/src/Umbraco.Web/_Legacy/PackageActions/addStringToHtmlElement.cs @@ -5,6 +5,7 @@ using Umbraco.Core.Configuration; using Umbraco.Core.Logging; using Umbraco.Core.Xml; using Umbraco.Core._Legacy.PackageActions; +using Umbraco.Web.Composing; namespace Umbraco.Web._Legacy.PackageActions { diff --git a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs b/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs index 596a532974..1bea5f858b 100644 --- a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs +++ b/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs @@ -2,6 +2,7 @@ using System; using System.Xml; using Umbraco.Core; using Umbraco.Core._Legacy.PackageActions; +using Umbraco.Web.Composing; namespace Umbraco.Web._Legacy.PackageActions { diff --git a/src/Umbraco.Web/_Legacy/UI/LegacyDialogTask.cs b/src/Umbraco.Web/_Legacy/UI/LegacyDialogTask.cs index df0258c172..1b040970dd 100644 --- a/src/Umbraco.Web/_Legacy/UI/LegacyDialogTask.cs +++ b/src/Umbraco.Web/_Legacy/UI/LegacyDialogTask.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Security.Authentication; using Umbraco.Core; using Umbraco.Core.Models.Membership; +using Umbraco.Web.Composing; using Umbraco.Web.UI; namespace Umbraco.Web._Legacy.UI diff --git a/src/Umbraco.Web/umbraco.presentation/default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/default.aspx.cs index 646ace2ec9..280a58de21 100644 --- a/src/Umbraco.Web/umbraco.presentation/default.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/default.aspx.cs @@ -18,6 +18,7 @@ using Umbraco.Core.IO; using Umbraco.Web.Templates; using umbraco.cms.businesslogic.web; using umbraco.cms.businesslogic; +using Umbraco.Web.Composing; namespace umbraco { diff --git a/src/Umbraco.Web/umbraco.presentation/item.cs b/src/Umbraco.Web/umbraco.presentation/item.cs index bcecdfd043..093254193c 100644 --- a/src/Umbraco.Web/umbraco.presentation/item.cs +++ b/src/Umbraco.Web/umbraco.presentation/item.cs @@ -10,6 +10,7 @@ using Umbraco.Core.Models.PublishedContent; using Umbraco.Web; using Umbraco.Core.Profiling; using Umbraco.Core.Strings; +using Umbraco.Web.Composing; namespace umbraco { diff --git a/src/Umbraco.Web/umbraco.presentation/library.cs b/src/Umbraco.Web/umbraco.presentation/library.cs index 55cb527e34..1749caf054 100644 --- a/src/Umbraco.Web/umbraco.presentation/library.cs +++ b/src/Umbraco.Web/umbraco.presentation/library.cs @@ -23,6 +23,7 @@ using Umbraco.Web.Templates; using umbraco.cms.businesslogic.web; using Umbraco.Core.IO; using Umbraco.Core.Xml; +using Umbraco.Web.Composing; using Umbraco.Web.PublishedCache; using Umbraco.Web.PublishedCache.XmlPublishedCache; using Language = umbraco.cms.businesslogic.language.Language; diff --git a/src/Umbraco.Web/umbraco.presentation/page.cs b/src/Umbraco.Web/umbraco.presentation/page.cs index 654004b537..d1edc746b0 100644 --- a/src/Umbraco.Web/umbraco.presentation/page.cs +++ b/src/Umbraco.Web/umbraco.presentation/page.cs @@ -16,6 +16,7 @@ using umbraco.cms.businesslogic.web; using Umbraco.Core.Configuration; using Umbraco.Core.PropertyEditors; using Umbraco.Web; +using Umbraco.Web.Composing; namespace umbraco { diff --git a/src/Umbraco.Web/umbraco.presentation/template.cs b/src/Umbraco.Web/umbraco.presentation/template.cs index e399bc1038..9d310fcf08 100644 --- a/src/Umbraco.Web/umbraco.presentation/template.cs +++ b/src/Umbraco.Web/umbraco.presentation/template.cs @@ -19,6 +19,7 @@ using umbraco.BusinessLogic; using Umbraco.Core.IO; using System.Web; using Umbraco.Core.Xml; +using Umbraco.Web.Composing; using Umbraco.Web.Macros; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs index cb84f8d9ef..3865ab5747 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs @@ -12,6 +12,7 @@ using umbraco.BusinessLogic; using umbraco.cms.businesslogic.media; using umbraco.cms.businesslogic.web; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.Actions; namespace umbraco.cms.presentation.Trees diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs index fea830b12d..486c79ba75 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Web; -using Current = Umbraco.Web.Current; +using Umbraco.Web.Composing; namespace umbraco.cms.presentation.Trees { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs index b89a859b75..6c11c9108f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs @@ -3,6 +3,7 @@ using umbraco.uicontrols.TreePicker; using Umbraco.Core; using Umbraco.Core.Services; using Umbraco.Web; +using Umbraco.Web.Composing; namespace umbraco.controls { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs index 920fbe5c7d..8e02b862c1 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs @@ -4,6 +4,7 @@ using System.Web.Script.Serialization; using Umbraco.Core.Logging; using Umbraco.Core; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.Actions; using Action = Umbraco.Web._Legacy.Actions.Action; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs index d2f8b8831a..f02d0ad01c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs @@ -5,6 +5,7 @@ using System.Text; using Umbraco.Core; using Umbraco.Core.Services; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.Actions; namespace umbraco.controls.Tree diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs index 49decdfebe..fbad59622c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs @@ -7,6 +7,7 @@ using ClientDependency.Core; using Umbraco.Core; using Umbraco.Core.Services; using Umbraco.Web; +using Umbraco.Web.Composing; namespace umbraco.controls { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs index 3245be350b..9363f2b891 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs @@ -2,6 +2,7 @@ using Umbraco.Core.Logging; using Umbraco.Web.UI; using Umbraco.Core; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.UI; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs index 57feb7cf9c..4bf3961ad2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs @@ -3,6 +3,7 @@ using Umbraco.Web.UI; using umbraco.cms.businesslogic.member; using Umbraco.Core; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.UI; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasksBase.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasksBase.cs index d96991cba0..07ac27332b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasksBase.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasksBase.cs @@ -7,6 +7,7 @@ using Umbraco.Core.Services; using Umbraco.Web.UI; using Umbraco.Core; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.UI; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs index 240abe7730..a2a0322369 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs @@ -2,6 +2,7 @@ using Umbraco.Web.UI; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.UI; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs index 69fc8e1577..0c37306a69 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs @@ -2,6 +2,7 @@ using System.Web; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.UI; using Umbraco.Web._Legacy.UI; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs index 3c92126422..8691191a67 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs @@ -6,6 +6,7 @@ using Umbraco.Core.Logging; using Umbraco.Web.UI; using Umbraco.Core.FileResources; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.UI; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs index 89a87dc8da..e685efd7a9 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs @@ -3,6 +3,7 @@ using Umbraco.Core.Logging; using Umbraco.Web.UI; using Umbraco.Core; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.UI; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs index 28f3753635..3697e09da3 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs @@ -4,6 +4,7 @@ using System.Web; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.UI; using Umbraco.Web._Legacy.UI; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs index 239b1f4e50..6b1796f0dc 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs @@ -5,6 +5,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using Umbraco.Core; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.UI; using MembershipProviderExtensions = Umbraco.Core.Security.MembershipProviderExtensions; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs index 08a314392d..e856662eeb 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs @@ -8,6 +8,7 @@ using System.Net; using System.Net.Mime; using Umbraco.Core.IO; using Umbraco.Core.Xml; +using Umbraco.Web.Composing; namespace dashboardUtilities { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs index 9849584520..6bbd4d15f6 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs @@ -18,6 +18,7 @@ using Umbraco.Web; using Umbraco.Core.PropertyEditors; using umbraco.BusinessLogic; using System.Collections.Generic; +using Umbraco.Web.Composing; using Umbraco.Web.UI.Pages; using MacroProperty = umbraco.cms.businesslogic.macro.MacroProperty; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs index 1fb7b03d2c..1ae12db451 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs @@ -17,6 +17,7 @@ using Umbraco.Web.UI; using Umbraco.Web.UI.Pages; using Umbraco.Core.Services; using Umbraco.Web; +using Umbraco.Web.Composing; namespace umbraco.cms.presentation.developer { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs index db56e50fc0..394a8475e0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs @@ -8,6 +8,7 @@ using Umbraco.Core.Logging; using Umbraco.Web; using umbraco.cms.presentation.Trees; using Umbraco.Core; +using Umbraco.Web.Composing; using Umbraco.Web.UI.Pages; using BizLogicAction = Umbraco.Web._Legacy.Actions.Action; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/RelationTypesWebService.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/RelationTypesWebService.asmx.cs index e1564b73f9..a494965d1c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/RelationTypesWebService.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/RelationTypesWebService.asmx.cs @@ -1,6 +1,7 @@ using System.Web.Services; using Umbraco.Core; using Umbraco.Web; +using Umbraco.Web.Composing; namespace umbraco.cms.presentation.developer.RelationTypes { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs index 7ad2703260..dae9d17088 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs @@ -10,6 +10,7 @@ using System.IO; using Umbraco.Core; using Umbraco.Core.IO; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.UI.Pages; namespace umbraco.presentation.umbraco.developer.Xslt diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs index a4e1ca26e9..50e5629a2f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs @@ -5,6 +5,7 @@ using Umbraco.Core; using Umbraco.Core.Services; using Umbraco.Web.UI.Pages; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.WebServices; using Umbraco.Web._Legacy.Actions; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx.cs index b7d824b46a..692eb581e3 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx.cs @@ -2,6 +2,7 @@ using System.Web; using Umbraco.Web; using Umbraco.Core; +using Umbraco.Web.Composing; namespace umbraco.presentation.dialogs { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs index e25fe4763b..b895fc3b24 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using Umbraco.Core; using Umbraco.Web; using umbraco.cms.businesslogic; +using Umbraco.Web.Composing; using Umbraco.Web.UI.Pages; using Umbraco.Web._Legacy.Actions; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx.cs index 3de9de8501..582fb4dee0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx.cs @@ -8,6 +8,7 @@ using System.Xml.Linq; using Umbraco.Core; using Umbraco.Core.IO; using Umbraco.Web; +using Umbraco.Web.Composing; namespace umbraco.presentation.umbraco.dialogs { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs index 4f03ce6f2d..cd405b4fa2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs @@ -6,6 +6,7 @@ using System.Web.UI.WebControls; using Umbraco.Core; using Umbraco.Core.Models.EntityBase; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.UI.Pages; using Umbraco.Web._Legacy.Actions; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs index 003772d442..0ad5ee6f9c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs @@ -15,6 +15,7 @@ using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Security; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.UI.Pages; using MembershipProviderExtensions = Umbraco.Core.Security.MembershipProviderExtensions; using MemberType = umbraco.cms.businesslogic.member.MemberType; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs index 6433c01aba..5af8a13cb2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs @@ -12,6 +12,7 @@ using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.UI.Pages; using Language = umbraco.cms.businesslogic.language.Language; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.cs index 2cd600eb22..fbb632bb2c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.cs @@ -5,6 +5,7 @@ using Umbraco.Core.Services; using Umbraco.Web; using System.Web.UI; using System.Collections.Generic; +using Umbraco.Web.Composing; using Umbraco.Web.UI.Pages; namespace umbraco.cms.presentation diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs index 53ead12857..edf89e4e5d 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs @@ -4,6 +4,7 @@ using Umbraco.Core.Configuration; using Umbraco.Core; using Umbraco.Core.Services; using Umbraco.Web; +using Umbraco.Web.Composing; namespace umbraco.dialogs { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs index 79db369f04..b36cf059c5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs @@ -11,6 +11,7 @@ using System.Web.UI.HtmlControls; using Umbraco.Core; using Umbraco.Core.Services; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.Actions; using Action = Umbraco.Web._Legacy.Actions.Action; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs index 2d1551e721..ef3d0c1783 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs @@ -3,6 +3,7 @@ using System.Web; using System.Web.UI; using Umbraco.Core; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.PublishedCache; namespace umbraco.presentation diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs index 8805ae85c0..5847dc1bf5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs @@ -11,6 +11,7 @@ using Umbraco.Core.IO; using umbraco.cms.businesslogic.template; using umbraco.uicontrols; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.UI.Pages; namespace umbraco.cms.presentation.settings diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs index e7d6e5615c..413da8a117 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs @@ -8,6 +8,7 @@ using Umbraco.Core.IO; using umbraco.cms.presentation.Trees; using umbraco.uicontrols; using Umbraco.Web; +using Umbraco.Web.Composing; namespace umbraco.cms.presentation.settings.scripts { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs index f18e7cd263..810cca2c89 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs @@ -10,6 +10,7 @@ using Umbraco.Core.Services; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.Macros; using Umbraco.Web._Legacy.Actions; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs index 0e11e510a5..63faa69d7f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs @@ -16,6 +16,7 @@ using Umbraco.Web.Templates; using umbraco.cms.businesslogic; using umbraco.cms.businesslogic.web; using Umbraco.Web; +using Umbraco.Web.Composing; namespace umbraco.presentation.templateControls { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs index 52fd950821..f0130fdeb6 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs @@ -9,6 +9,7 @@ using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.Models; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.Macros; namespace umbraco.presentation.templateControls diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs index 393f43b407..7a5595d6e9 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs @@ -25,6 +25,7 @@ using Umbraco.Web.UI.Pages; using System.Text.RegularExpressions; using System.Text; using Umbraco.Core.Security; +using Umbraco.Web.Composing; namespace umbraco.cms.presentation.user { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserPermissions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserPermissions.cs index 253780dff6..4e6e032ece 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserPermissions.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserPermissions.cs @@ -5,6 +5,7 @@ using Umbraco.Core.Services; using Umbraco.Web; using umbraco.cms.businesslogic.web; using Umbraco.Core.Models.Membership; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.Actions; namespace umbraco.cms.presentation.user diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserTypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserTypeTasks.cs index e0566b7333..d9a1286c14 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserTypeTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserTypeTasks.cs @@ -11,6 +11,7 @@ using Umbraco.Web.UI; using Umbraco.Core; using Umbraco.Core.Models.Membership; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web._Legacy.UI; namespace umbraco.cms.presentation.user diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs index 2788297ce2..a9953318e5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs @@ -15,6 +15,7 @@ using Umbraco.Core.Security; using Umbraco.Core.Xml; using Umbraco.Web.Security; using Umbraco.Web; +using Umbraco.Web.Composing; namespace umbraco.presentation.webservices { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs index 79d5a81986..80bb346696 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs @@ -7,6 +7,7 @@ using Umbraco.Core; using Umbraco.Web.WebServices; using Umbraco.Core.Configuration; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.Install; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs index a192cac61c..96f3e23a72 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs @@ -8,6 +8,7 @@ using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.WebServices; using Umbraco.Web._Legacy.Actions;