diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs index 2b45f04b31..ca476a3538 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs @@ -6,8 +6,8 @@ using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.ModelsBuilder.Embedded.Building; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.Common.Authorization; namespace Umbraco.Cms.ModelsBuilder.Embedded.BackOffice diff --git a/src/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs b/src/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs index 2f8695ef99..48b0eeae9b 100644 --- a/src/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs +++ b/src/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs @@ -5,8 +5,8 @@ using System; using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.ContentEditing; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Core; -using Umbraco.Web.BackOffice.Controllers; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.Integration.TestServerTest.Controllers diff --git a/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs b/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs index 9ea7f7a2c2..83618301ed 100644 --- a/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs +++ b/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs @@ -10,6 +10,7 @@ using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Core; using Umbraco.Core.Security; using Umbraco.Core.Services; diff --git a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs index 1bddf13b0d..c5baa0bfd9 100644 --- a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs +++ b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs @@ -19,15 +19,11 @@ using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Cache; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Extensions; using Umbraco.Tests.Integration.DependencyInjection; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; -using Umbraco.Web; -using Umbraco.Web.BackOffice.Controllers; -using Umbraco.Web.BackOffice.DependencyInjection; using Umbraco.Web.Common.Controllers; using Umbraco.Web.Common.DependencyInjection; using Umbraco.Web.Website.Controllers; diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs index 1da7c062b7..bbce6e084f 100644 --- a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs +++ b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs @@ -37,7 +37,6 @@ using Umbraco.Tests.Integration.DependencyInjection; using Umbraco.Tests.Integration.Extensions; using Umbraco.Tests.Integration.Implementations; using Umbraco.Tests.Testing; -using Umbraco.Web.BackOffice.DependencyInjection; using Umbraco.Web.Common.DependencyInjection; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs index 9304f005b3..6dccfddc07 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs @@ -5,8 +5,8 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; using NUnit.Framework; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Tests.Integration.TestServerTest; -using Umbraco.Web.BackOffice.Controllers; namespace Umbraco.Tests.Integration.Umbraco.Web.BackOffice.Controllers { diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs index 1d34e7acc2..dbdda6d841 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs @@ -10,11 +10,11 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; using Umbraco.Tests.Integration.TestServerTest; -using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.Common.Formatters; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs index aaacf1167f..36e0e519fb 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs @@ -8,10 +8,10 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NUnit.Framework; using Umbraco.Cms.Core.Models.TemplateQuery; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Extensions; using Umbraco.Tests.Common.Builders.Extensions; using Umbraco.Tests.Integration.TestServerTest; -using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.Common.Formatters; namespace Umbraco.Tests.Integration.Umbraco.Web.BackOffice.Controllers diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs index df294a1de8..49623c31c4 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs @@ -16,11 +16,11 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; using Umbraco.Tests.Integration.TestServerTest; -using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.Common.Formatters; namespace Umbraco.Tests.Integration.Umbraco.Web.BackOffice.Controllers diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs index c51b76ea52..b59d5c7ec6 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs @@ -20,12 +20,12 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.ModelBinders; using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; -using Umbraco.Web.BackOffice.Filters; -using Umbraco.Web.BackOffice.ModelBinders; using Umbraco.Web.PropertyEditors; using DataType = Umbraco.Cms.Core.Models.DataType; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs index 3b7d95dbc5..5b8feb8fd7 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs @@ -6,8 +6,8 @@ using Microsoft.Extensions.DependencyInjection; using NUnit.Framework; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Core.Security; +using Umbraco.Extensions; using Umbraco.Tests.Integration.Testing; -using Umbraco.Web.BackOffice.DependencyInjection; namespace Umbraco.Tests.Integration.Umbraco.Web.BackOffice { diff --git a/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs b/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs index 3fd2dc019c..4acd15b01e 100644 --- a/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs +++ b/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs @@ -15,11 +15,11 @@ using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.BackOffice.Routing; using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.Security; -using Umbraco.Web.BackOffice.Controllers; -using Umbraco.Web.BackOffice.Routing; using Umbraco.Web.Common.Install; using Umbraco.Web.Common.Security; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs index 25cde5dfbf..44256bb829 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs @@ -9,8 +9,8 @@ using Microsoft.Extensions.Logging; using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Composing; +using Umbraco.Cms.Web.BackOffice.Trees; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Trees; namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs index cad25d2d65..0da7a0def5 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs @@ -14,6 +14,7 @@ using Umbraco.Cms.Core.Editors; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Core; using Umbraco.Core.Security; using Umbraco.Core.Services; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs index 4f6707a7fc..0375bc7a28 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs @@ -10,6 +10,7 @@ using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Core; using Umbraco.Core.Security; using Umbraco.Tests.Common.Builders; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs index b37c817b84..e5393db851 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs @@ -13,6 +13,7 @@ using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Persistence.Querying; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs index f986e03e90..2aead52901 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs @@ -15,6 +15,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Security; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs index 70bc160560..30742e7c11 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs @@ -11,6 +11,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Security; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs index 830954aaf6..a98acef088 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs @@ -7,8 +7,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Moq; using NUnit.Framework; +using Umbraco.Cms.Web.BackOffice.Authorization; +using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Web.BackOffice.Authorization; -using Umbraco.Web.BackOffice.Security; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs index 314ba818cc..05b594f154 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs @@ -15,6 +15,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Security; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs index b8a292cd88..7fd5c0c836 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs @@ -11,6 +11,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Core.Models; using Umbraco.Core.Security; using Umbraco.Core.Services; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs index 23ffdf0d79..f4edcc1d8e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs @@ -9,6 +9,7 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; +using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Core; using Umbraco.Core.Security; using Umbraco.Tests.Common.Builders; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs index fff9dcc85b..91672c2c47 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs @@ -11,6 +11,7 @@ using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Core; using Umbraco.Core.Security; using Umbraco.Tests.Common.Builders; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs index cae870565e..a152247658 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs @@ -12,6 +12,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Core; using Umbraco.Core.Security; using Umbraco.Core.Services; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs index 2e400aa8c5..2473a8b265 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs @@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Moq; using NUnit.Framework; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Core.Security; using Umbraco.Tests.UnitTests.AutoFixture; -using Umbraco.Web.BackOffice.Controllers; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs index d09e0dc4c1..91ffb7c04d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Services; +using Umbraco.Cms.Web.BackOffice.Extensions; using Umbraco.Extensions; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Extensions diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs index 21926b285a..174cc94b19 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs @@ -13,8 +13,8 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; +using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Core.Security; -using Umbraco.Web.BackOffice.Filters; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Filters { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs index 9305769054..caf7a16fff 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs @@ -7,7 +7,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NUnit.Framework; using Umbraco.Cms.Core.PropertyEditors.Validation; -using Umbraco.Web.BackOffice.PropertyEditors.Validation; +using Umbraco.Cms.Web.BackOffice.PropertyEditors.Validation; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Filters { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs index a4603f2e66..d50ff7d286 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs @@ -13,10 +13,10 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; -using Umbraco.Web.BackOffice.Filters; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Filters { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttributeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttributeTests.cs index f616216974..0cb9672921 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttributeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttributeTests.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Routing; using Moq; using NUnit.Framework; -using Umbraco.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.Filters; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Filters { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs index a14084c923..8cf9ee99a2 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Routing; using Moq; using NUnit.Framework; -using Umbraco.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.Filters; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Filters { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs index aa800e294d..6efec685f0 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs @@ -13,8 +13,8 @@ using Microsoft.Net.Http.Headers; using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Security; +using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Security; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Security diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs index ceac90b725..ba88d61edf 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs @@ -10,12 +10,12 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Core; using Umbraco.Extensions; using Umbraco.Tests.TestHelpers; using Umbraco.Web; -using Umbraco.Web.BackOffice.Controllers; -using Umbraco.Web.BackOffice.Security; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Backoffice.Security diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs index c726ff990c..8492a575aa 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs @@ -13,8 +13,8 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Tests.UnitTests.AutoFixture; -using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.Common.Install; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs index 507f3993b3..6a367f6da2 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs @@ -11,10 +11,10 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.BackOffice.Routing; using Umbraco.Core; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Controllers; -using Umbraco.Web.BackOffice.Routing; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Controllers; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs index cb014e716f..d2b9d5f182 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs @@ -11,10 +11,10 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.BackOffice.Routing; using Umbraco.Core; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Controllers; -using Umbraco.Web.BackOffice.Routing; using Constants = Umbraco.Cms.Core.Constants; using static Umbraco.Cms.Core.Constants.Web.Routing; diff --git a/src/Umbraco.Web.BackOffice/ActionResults/JavaScriptResult.cs b/src/Umbraco.Web.BackOffice/ActionResults/JavaScriptResult.cs index d440cc833d..2d9b87b680 100644 --- a/src/Umbraco.Web.BackOffice/ActionResults/JavaScriptResult.cs +++ b/src/Umbraco.Web.BackOffice/ActionResults/JavaScriptResult.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace Umbraco.Web.BackOffice.ActionResults +namespace Umbraco.Cms.Web.BackOffice.ActionResults { public class JavaScriptResult : ContentResult { diff --git a/src/Umbraco.Web.BackOffice/ActionResults/UmbracoErrorResult.cs b/src/Umbraco.Web.BackOffice/ActionResults/UmbracoErrorResult.cs index e810fb1eb3..cb4d999e69 100644 --- a/src/Umbraco.Web.BackOffice/ActionResults/UmbracoErrorResult.cs +++ b/src/Umbraco.Web.BackOffice/ActionResults/UmbracoErrorResult.cs @@ -1,7 +1,7 @@ using System.Net; using Microsoft.AspNetCore.Mvc; -namespace Umbraco.Web.BackOffice.ActionResults +namespace Umbraco.Cms.Web.BackOffice.ActionResults { public class UmbracoErrorResult : ObjectResult { diff --git a/src/Umbraco.Web.BackOffice/ActionResults/UmbracoNotificationSuccessResponse.cs b/src/Umbraco.Web.BackOffice/ActionResults/UmbracoNotificationSuccessResponse.cs index f069e460d0..37e4902626 100644 --- a/src/Umbraco.Web.BackOffice/ActionResults/UmbracoNotificationSuccessResponse.cs +++ b/src/Umbraco.Web.BackOffice/ActionResults/UmbracoNotificationSuccessResponse.cs @@ -2,7 +2,7 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Extensions; -namespace Umbraco.Web.BackOffice.ActionResults +namespace Umbraco.Cms.Web.BackOffice.ActionResults { public class UmbracoNotificationSuccessResponse : OkObjectResult { diff --git a/src/Umbraco.Web.BackOffice/Authorization/AdminUsersHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/AdminUsersHandler.cs index 1022df3854..64649ac274 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/AdminUsersHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/AdminUsersHandler.cs @@ -13,7 +13,7 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Extensions; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// If the users being edited is an admin then we must ensure that the current user is also an admin. diff --git a/src/Umbraco.Web.BackOffice/Authorization/AdminUsersRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/AdminUsersRequirement.cs index e8a56ee8cb..95e115bc16 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/AdminUsersRequirement.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/AdminUsersRequirement.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authorization; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Authorization requirement for the diff --git a/src/Umbraco.Web.BackOffice/Authorization/BackOfficeHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/BackOfficeHandler.cs index 4cc2502360..97108f5460 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/BackOfficeHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/BackOfficeHandler.cs @@ -6,10 +6,8 @@ using Microsoft.AspNetCore.Authorization; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Security; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Ensures authorization is successful for a back office user. diff --git a/src/Umbraco.Web.BackOffice/Authorization/BackOfficeRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/BackOfficeRequirement.cs index 17c5f6e02a..1bce297b9b 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/BackOfficeRequirement.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/BackOfficeRequirement.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authorization; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Authorization requirement for the diff --git a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandler.cs index 825b633de0..b620daf0f8 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandler.cs @@ -11,12 +11,8 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// The user must have access to all descendant nodes of the content item in order to continue. diff --git a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchRequirement.cs index cfa6f512a2..caf987488f 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchRequirement.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchRequirement.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authorization; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Authorization requirement for diff --git a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandler.cs index 01e38cf8e4..10d2aaffde 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandler.cs @@ -8,11 +8,8 @@ using Microsoft.Extensions.Primitives; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Used to authorize if the user has the correct permission access to the content for the content id specified in a query string. diff --git a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringRequirement.cs index ee386295c2..d958968d6e 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringRequirement.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringRequirement.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authorization; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// An authorization requirement for diff --git a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResource.cs b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResource.cs index b618e3b3cb..4c9da3ae41 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResource.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResource.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using Umbraco.Cms.Core.Models; -using Umbraco.Core.Models; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// The resource used for the diff --git a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandler.cs index 9a18e6c620..3c1bf8ae56 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandler.cs @@ -5,10 +5,8 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Security; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Used to authorize if the user has the correct permission access to the content for the specified. diff --git a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceRequirement.cs index fcf2838f33..af86ab080b 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceRequirement.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceRequirement.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authorization; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// An authorization requirement for diff --git a/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandler.cs index 6c09d00ef7..dd6b7a6483 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandler.cs @@ -3,9 +3,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; -using Umbraco.Web.BackOffice.Security; +using Umbraco.Cms.Web.BackOffice.Security; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Ensures the resource cannot be accessed if returns true. diff --git a/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginRequirement.cs index b295c74621..d148342e3a 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginRequirement.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginRequirement.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authorization; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Marker requirement for the . diff --git a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandler.cs index 981b23452c..6deccbc0cb 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandler.cs @@ -8,11 +8,8 @@ using Microsoft.Extensions.Primitives; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Used to authorize if the user has the correct permission access to the media for the media id specified in a query string. diff --git a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringRequirement.cs index 14d9d77834..6c17d5cfac 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringRequirement.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringRequirement.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authorization; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// An authorization requirement for diff --git a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResource.cs b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResource.cs index fe2e525a20..48eed0a844 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResource.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResource.cs @@ -2,9 +2,8 @@ // See LICENSE for more details. using Umbraco.Cms.Core.Models; -using Umbraco.Core.Models; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { public class MediaPermissionsResource { diff --git a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandler.cs index c58faa6878..71cace6b6f 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandler.cs @@ -5,10 +5,8 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Security; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Used to authorize if the user has the correct permission access to the content for the specified. diff --git a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceRequirement.cs index b615a81709..637636ede6 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceRequirement.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceRequirement.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authorization; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// An authorization requirement for diff --git a/src/Umbraco.Web.BackOffice/Authorization/MustSatisfyRequirementAuthorizationHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/MustSatisfyRequirementAuthorizationHandler.cs index b990906942..d64459c94f 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/MustSatisfyRequirementAuthorizationHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/MustSatisfyRequirementAuthorizationHandler.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Abstract handler that must satisfy the requirement so Succeed or Fail will be called no matter what. diff --git a/src/Umbraco.Web.BackOffice/Authorization/PermissionsQueryStringHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/PermissionsQueryStringHandler.cs index ecbad40c5a..531b92a7e9 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/PermissionsQueryStringHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/PermissionsQueryStringHandler.cs @@ -8,12 +8,8 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Abstract base class providing common functionality for authorization checks based on querystrings. diff --git a/src/Umbraco.Web.BackOffice/Authorization/SectionHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/SectionHandler.cs index 655302f27d..4b2ffd356d 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/SectionHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/SectionHandler.cs @@ -5,9 +5,8 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Umbraco.Cms.Core.Security; -using Umbraco.Core.Security; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Ensures that the current user has access to the section diff --git a/src/Umbraco.Web.BackOffice/Authorization/SectionRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/SectionRequirement.cs index a7e3aa5e2c..efd4a3b3bb 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/SectionRequirement.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/SectionRequirement.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Authorization; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Authorization requirements for diff --git a/src/Umbraco.Web.BackOffice/Authorization/TreeHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/TreeHandler.cs index 69eec833a9..6e9269e6bd 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/TreeHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/TreeHandler.cs @@ -9,7 +9,7 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Extensions; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Ensures that the current user has access to the section for which the specified tree(s) belongs diff --git a/src/Umbraco.Web.BackOffice/Authorization/TreeRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/TreeRequirement.cs index 1d8671d3c9..c8c7d2853a 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/TreeRequirement.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/TreeRequirement.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Authorization; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Authorization requirements for diff --git a/src/Umbraco.Web.BackOffice/Authorization/UserGroupHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/UserGroupHandler.cs index 8239fd1495..8020faa4ff 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/UserGroupHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/UserGroupHandler.cs @@ -11,10 +11,10 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Controllers; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Authorizes that the current user has access to the user group Id in the request diff --git a/src/Umbraco.Web.BackOffice/Authorization/UserGroupRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/UserGroupRequirement.cs index 2a14bb1a78..ae82309f8d 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/UserGroupRequirement.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/UserGroupRequirement.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authorization; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.BackOffice.Authorization { /// /// Authorization requirement for the diff --git a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs index 60bbe4f5af..f8060826c7 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs @@ -22,23 +22,19 @@ using Umbraco.Cms.Core.Models.Security; using Umbraco.Cms.Core.Net; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; +using Umbraco.Cms.Web.BackOffice.Extensions; +using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Core.Security; -using Umbraco.Core.Services; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Filters; -using Umbraco.Web.BackOffice.Security; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Umbraco.Web.Common.Controllers; using Umbraco.Web.Common.Filters; -using Umbraco.Web.Common.Security; -using Umbraco.Web.Models; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { // See // for a bigger example of this type of controller implementation in netcore: diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsController.cs index 0d3f2bca51..da073325e1 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsController.cs @@ -2,18 +2,16 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; -using Umbraco.Core; -using Umbraco.Core.Configuration; using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] public class BackOfficeAssetsController : UmbracoAuthorizedJsonController diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs index 8859d923a7..fa01c7cfed 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs @@ -13,9 +13,7 @@ using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; -using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Grid; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; @@ -24,27 +22,20 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.WebAssets; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Configuration; +using Umbraco.Cms.Web.BackOffice.ActionResults; +using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Core.Security; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.ActionResults; -using Umbraco.Web.BackOffice.Filters; -using Umbraco.Web.BackOffice.Security; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Umbraco.Web.Common.Controllers; using Umbraco.Web.Common.Filters; -using Umbraco.Web.Common.Security; -using Umbraco.Web.Models; using Umbraco.Web.WebAssets; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [DisableBrowserCache] [UmbracoRequireHttps] diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeNotificationsController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeNotificationsController.cs index 5c6a999e4a..4cecb20aa5 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeNotificationsController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeNotificationsController.cs @@ -1,6 +1,6 @@ -using Umbraco.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.Filters; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// An abstract controller that automatically checks if any request is a non-GET and if the diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs index 4ef90d6d2d..6f98586d72 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs @@ -16,19 +16,18 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; using Umbraco.Cms.Core.WebAssets; +using Umbraco.Cms.Web.BackOffice.HealthChecks; +using Umbraco.Cms.Web.BackOffice.Profiling; +using Umbraco.Cms.Web.BackOffice.PropertyEditors; +using Umbraco.Cms.Web.BackOffice.Routing; +using Umbraco.Cms.Web.BackOffice.Security; +using Umbraco.Cms.Web.BackOffice.Trees; using Umbraco.Core; -using Umbraco.Core.Configuration; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.HealthChecks; -using Umbraco.Web.BackOffice.Profiling; -using Umbraco.Web.BackOffice.PropertyEditors; -using Umbraco.Web.BackOffice.Routing; -using Umbraco.Web.BackOffice.Security; -using Umbraco.Web.BackOffice.Trees; using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// Used to collect the server variables for use in the back office angular app diff --git a/src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs b/src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs index ff8eae3952..430ff45e51 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs @@ -17,12 +17,9 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Strings.Css; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.Trees; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Filters; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; @@ -30,7 +27,7 @@ using Constants = Umbraco.Cms.Core.Constants; using Stylesheet = Umbraco.Cms.Core.Models.Stylesheet; using StylesheetRule = Umbraco.Cms.Core.Models.ContentEditing.StylesheetRule; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { // TODO: Put some exception filters in our webapi to return 404 instead of 500 when we throw ArgumentNullException // ref: https://www.exceptionnotfound.net/the-asp-net-web-api-exception-handling-pipeline-a-guided-tour/ diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs index 9732fcbe76..57f8029a40 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs @@ -17,7 +17,6 @@ using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; -using Umbraco.Cms.Core.Models.Mapping; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Models.Validation; using Umbraco.Cms.Core.Persistence.Querying; @@ -27,28 +26,19 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Events; -using Umbraco.Core.Models; +using Umbraco.Cms.Web.BackOffice.ActionResults; +using Umbraco.Cms.Web.BackOffice.Authorization; +using Umbraco.Cms.Web.BackOffice.Extensions; +using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.ModelBinders; using Umbraco.Core.Persistence; -using Umbraco.Core.Persistence.Querying; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Security; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.ActionResults; -using Umbraco.Web.BackOffice.Authorization; -using Umbraco.Web.BackOffice.Filters; -using Umbraco.Web.BackOffice.ModelBinders; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Mapping; -using Umbraco.Web.Routing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// The API controller used for editing content diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs index c9ce8fc233..ab692f69c9 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs @@ -2,7 +2,6 @@ using System; using System.Linq; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Dictionary; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; @@ -15,7 +14,7 @@ using Umbraco.Cms.Core.Strings; using Umbraco.Extensions; using Umbraco.Web.Common.Filters; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// An abstract base controller used for media/content/members to try to reduce code replication. diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs index 12d5ebb136..25e8dcfe4c 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs @@ -29,7 +29,7 @@ using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; using ContentType = Umbraco.Cms.Core.Models.ContentType; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// An API controller used for dealing with content types diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs index 393a773e44..a933776a16 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Net; using System.Net.Mime; using System.Text; using Microsoft.AspNetCore.Mvc; @@ -14,17 +13,14 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Cms.Web.BackOffice.Extensions; +using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Filters; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Exceptions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// Am abstract API controller providing functionality used for dealing with content and media types diff --git a/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs b/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs index 0913555213..345b6880d9 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs @@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Newtonsoft.Json; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; @@ -21,21 +20,17 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; +using Umbraco.Cms.Web.BackOffice.Extensions; +using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Core.Security; -using Umbraco.Core.Services; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Filters; -using Umbraco.Web.BackOffice.Security; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// Controller to back the User.Resource service, used for fetching user data when already authenticated. user.service is currently used for handling authentication diff --git a/src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs b/src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs index 3dc3fb5ecb..406b3b66f3 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs @@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Dashboards; @@ -16,15 +15,15 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Filters; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Umbraco.Web.Common.Controllers; using Umbraco.Web.Common.Filters; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { //we need to fire up the controller like this to enable loading of remote css directly from this controller [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] diff --git a/src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs index 726b4e2ba6..f95068d259 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs @@ -16,20 +16,15 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Security; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Cms.Web.BackOffice.Extensions; +using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Filters; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// The API controller used for editing data types diff --git a/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs b/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs index a5daea03cf..62330d12eb 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs @@ -13,17 +13,14 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Cms.Web.BackOffice.Extensions; using Umbraco.Extensions; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// diff --git a/src/Umbraco.Web.BackOffice/Controllers/ElementTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/ElementTypeController.cs index 5b5ac56ad0..4b32f020a4 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ElementTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ElementTypeController.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Services; using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController("UmbracoApi")] public class ElementTypeController : UmbracoAuthorizedJsonController diff --git a/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs b/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs index a4c78265e8..f9642dbaa0 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs @@ -10,7 +10,6 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Entities; -using Umbraco.Cms.Core.Models.Mapping; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Models.TemplateQuery; using Umbraco.Cms.Core.Routing; @@ -19,22 +18,16 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Trees; using Umbraco.Cms.Core.Xml; -using Umbraco.Core; -using Umbraco.Core.Models; +using Umbraco.Cms.Web.BackOffice.ModelBinders; using Umbraco.Core.Persistence; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.ModelBinders; +using Umbraco.Web; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.ModelBinders; -using Umbraco.Web.Models; -using Umbraco.Web.Models.Mapping; -using Umbraco.Web.Routing; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// The API controller used for getting entity objects, basic name, icon, id representation of umbraco objects that are based on CMSNode diff --git a/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs b/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs index 659e0c55a0..1e4d9a55a8 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs @@ -4,21 +4,17 @@ using System.Linq; using Examine; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models.ContentEditing; -using Umbraco.Core; -using Umbraco.Core.Cache; using Umbraco.Examine; using Umbraco.Extensions; -using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; using SearchResult = Umbraco.Cms.Core.Models.ContentEditing.SearchResult; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] public class ExamineManagementController : UmbracoAuthorizedJsonController diff --git a/src/Umbraco.Web.BackOffice/Controllers/HelpController.cs b/src/Umbraco.Web.BackOffice/Controllers/HelpController.cs index fe983ed734..4bc69502e3 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/HelpController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/HelpController.cs @@ -1,14 +1,13 @@ -using Newtonsoft.Json; -using System.Collections.Generic; +using System.Collections.Generic; using System.Net.Http; using System.Runtime.Serialization; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using Umbraco.Core; +using Newtonsoft.Json; using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] public class HelpController : UmbracoAuthorizedJsonController diff --git a/src/Umbraco.Web.BackOffice/Controllers/IconController.cs b/src/Umbraco.Web.BackOffice/Controllers/IconController.cs index 73fde0bcd8..46e62a4f07 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/IconController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/IconController.cs @@ -1,11 +1,9 @@ using System.Collections.Generic; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Models; -using Umbraco.Core.Services; using Umbraco.Web.Common.Attributes; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController("UmbracoApi")] public class IconController : UmbracoAuthorizedApiController diff --git a/src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs b/src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs index 7fe821bbbb..bfe05afec2 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs @@ -1,17 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Umbraco.Cms.Core.Media; +using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Models; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Models; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// The API controller used for getting URLs for images with parameters diff --git a/src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs b/src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs index 3b3f564555..7b3dd04945 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs @@ -8,7 +8,7 @@ using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// A controller used to return images for media diff --git a/src/Umbraco.Web.BackOffice/Controllers/KeepAliveController.cs b/src/Umbraco.Web.BackOffice/Controllers/KeepAliveController.cs index d7d5cc7084..8b039cd93b 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/KeepAliveController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/KeepAliveController.cs @@ -1,13 +1,11 @@ -using System; -using System.Runtime.Serialization; +using System.Runtime.Serialization; using Microsoft.AspNetCore.Mvc; -using Umbraco.Core; -using Umbraco.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Controllers; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] [IsBackOffice] diff --git a/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs b/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs index 91f038dee6..5ac98c8a3c 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs @@ -5,14 +5,11 @@ using System.Linq; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Cms.Web.BackOffice.Extensions; using Umbraco.Extensions; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; @@ -20,7 +17,7 @@ using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; using Language = Umbraco.Cms.Core.Models.ContentEditing.Language; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// Backoffice controller supporting the dashboard for language administration. diff --git a/src/Umbraco.Web.BackOffice/Controllers/LogController.cs b/src/Umbraco.Web.BackOffice/Controllers/LogController.cs index 67c4543a7f..cd46b7531e 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/LogController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/LogController.cs @@ -1,7 +1,7 @@ -using Microsoft.AspNetCore.Authorization; -using System; +using System; using System.Collections.Generic; using System.Linq; +using Microsoft.AspNetCore.Authorization; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.IO; @@ -11,18 +11,12 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; using Umbraco.Core.Persistence; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -using Umbraco.Web.BackOffice.Filters; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// The API controller used for getting log history diff --git a/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs b/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs index ecfa6efd3e..b46a1e8e0f 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs @@ -4,15 +4,13 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; -using Umbraco.Core; using Umbraco.Core.Logging.Viewer; -using Umbraco.Core.Models; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// Backoffice controller supporting the dashboard for viewing logs with some simple graphs & filtering diff --git a/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs b/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs index fd0237a61b..bce7c48601 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Text; using System.Threading; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; @@ -19,7 +18,7 @@ using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// API controller to deal with Macro data diff --git a/src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs b/src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs index 11dfe64921..ed670847b6 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs @@ -21,7 +21,7 @@ using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// diff --git a/src/Umbraco.Web.BackOffice/Controllers/MediaController.cs b/src/Umbraco.Web.BackOffice/Controllers/MediaController.cs index c09043e1a6..5733b23c30 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MediaController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MediaController.cs @@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Umbraco.Cms.Core; -using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.ContentApps; using Umbraco.Cms.Core.Dictionary; @@ -31,27 +30,19 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Events; -using Umbraco.Core.Models; +using Umbraco.Cms.Web.BackOffice.ActionResults; +using Umbraco.Cms.Web.BackOffice.Authorization; +using Umbraco.Cms.Web.BackOffice.Extensions; +using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.ModelBinders; using Umbraco.Core.Persistence; -using Umbraco.Core.Persistence.Querying; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Security; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.ActionResults; -using Umbraco.Web.BackOffice.Authorization; -using Umbraco.Web.BackOffice.Filters; -using Umbraco.Web.BackOffice.ModelBinders; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting diff --git a/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs index 77e17ed9cb..b9a14dc498 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs @@ -18,7 +18,7 @@ using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// An API controller used for dealing with content types diff --git a/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs b/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs index aec816bca9..a0b31c8f44 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs @@ -24,24 +24,18 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Events; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Security; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Cms.Web.BackOffice.Extensions; +using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.ModelBinders; using Umbraco.Core.Services.Implement; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Filters; -using Umbraco.Web.BackOffice.ModelBinders; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Umbraco.Web.Common.Filters; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting diff --git a/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs b/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs index f97781f615..3285342423 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs @@ -13,7 +13,7 @@ using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// An API controller used for dealing with member groups diff --git a/src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs index 27e27cf7fa..d2227001d3 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs @@ -17,7 +17,7 @@ using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// An API controller used for dealing with member types diff --git a/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs b/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs index ddab4d28c4..a017313776 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs @@ -13,17 +13,14 @@ using Umbraco.Cms.Core.Packaging; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Semver; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Cms.Web.BackOffice.Extensions; using Umbraco.Extensions; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// A controller used for managing packages in the back office diff --git a/src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs b/src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs index 35f957d6bd..809bc070d7 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs @@ -23,7 +23,7 @@ using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// A controller used for installing packages and managing all of the data in the packages section in the back office diff --git a/src/Umbraco.Web.BackOffice/Controllers/ParameterSwapControllerActionSelectorAttribute.cs b/src/Umbraco.Web.BackOffice/Controllers/ParameterSwapControllerActionSelectorAttribute.cs index 880a4ff15c..ac0a7fea84 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ParameterSwapControllerActionSelectorAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ParameterSwapControllerActionSelectorAttribute.cs @@ -6,11 +6,9 @@ using Microsoft.AspNetCore.Mvc.ActionConstraints; using Microsoft.AspNetCore.Mvc.Controllers; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; -using Umbraco.Core; using Umbraco.Extensions; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)] internal class ParameterSwapControllerActionSelectorAttribute : Attribute, IActionConstraint diff --git a/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs b/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs index f497c85494..9b2c353ff6 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs @@ -1,24 +1,11 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.ViewEngines; -using Microsoft.Extensions.Options; using System; using System.IO; using System.Linq; using System.Threading.Tasks; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Filters; -using Umbraco.Web.BackOffice.ActionResults; -using Umbraco.Web.Common.Filters; -using Umbraco.Web.PublishedCache; -using Umbraco.Web.WebAssets; -using Constants = Umbraco.Cms.Core.Constants; using Microsoft.AspNetCore.Authorization; -using Umbraco.Cms.Core; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.ViewEngines; +using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Editors; using Umbraco.Cms.Core.Features; @@ -28,9 +15,15 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Core.WebAssets; +using Umbraco.Cms.Web.BackOffice.ActionResults; +using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Extensions; using Umbraco.Web.Common.Authorization; +using Umbraco.Web.Common.Filters; +using Umbraco.Web.WebAssets; +using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [DisableBrowserCache] [Area(Constants.Web.Mvc.BackOfficeArea)] diff --git a/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs b/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs index 84f90ca365..6110a5f3e2 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs @@ -1,16 +1,13 @@ using System; -using System.Reflection.Metadata; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.PublishedCache; -using Umbraco.Core; using Umbraco.Web.Cache; using Umbraco.Web.Common.Attributes; -using Umbraco.Web.PublishedCache; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] public class PublishedSnapshotCacheStatusController : UmbracoAuthorizedApiController diff --git a/src/Umbraco.Web.BackOffice/Controllers/PublishedStatusController.cs b/src/Umbraco.Web.BackOffice/Controllers/PublishedStatusController.cs index a50f554654..8df529ddd3 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/PublishedStatusController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/PublishedStatusController.cs @@ -1,9 +1,8 @@ using System; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.PublishedCache; -using Umbraco.Web.PublishedCache; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { public class PublishedStatusController : UmbracoAuthorizedApiController { diff --git a/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs b/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs index 263ce1c256..7865c4ca8d 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs @@ -19,7 +19,7 @@ using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] public class RedirectUrlManagementController : UmbracoAuthorizedApiController diff --git a/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs b/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs index e73e2849e0..afe0dd0102 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs @@ -11,7 +11,7 @@ using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] [Authorize(Policy = AuthorizationPolicies.SectionAccessContent)] diff --git a/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs index 4d215373c2..bd653dd580 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs @@ -17,7 +17,7 @@ using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// The API controller for editing relation types. diff --git a/src/Umbraco.Web.BackOffice/Controllers/SectionController.cs b/src/Umbraco.Web.BackOffice/Controllers/SectionController.cs index 97635cfa3a..6d610c9d94 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/SectionController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/SectionController.cs @@ -11,13 +11,13 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Trees; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Trees; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Models.Trees; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// The API controller used for using the list of sections diff --git a/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs b/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs index 8b0f8fdcd1..a1884a6595 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs @@ -6,7 +6,7 @@ using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// The API controller used for retrieving available stylesheets diff --git a/src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs b/src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs index 0f580cf455..d3822ad6a8 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs @@ -10,14 +10,11 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] [Authorize(Policy = AuthorizationPolicies.TreeAccessTemplates)] diff --git a/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs b/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs index 0ec22f8a50..11638160e6 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs @@ -3,16 +3,16 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Models.TemplateQuery; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Filters; +using Umbraco.Web; using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// The API controller used for building content queries within the template diff --git a/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs b/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs index 08ffab8d33..eb930e3862 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs @@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; @@ -20,7 +19,7 @@ using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] [Authorize(Policy = AuthorizationPolicies.SectionAccessForTinyMce)] diff --git a/src/Umbraco.Web.BackOffice/Controllers/TourController.cs b/src/Umbraco.Web.BackOffice/Controllers/TourController.cs index 42f750602a..b3926a7d0c 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/TourController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/TourController.cs @@ -10,14 +10,10 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Tour; -using Umbraco.Core; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Models; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] public class TourController : UmbracoAuthorizedJsonController diff --git a/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedApiController.cs b/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedApiController.cs index 9c415fe180..376e4b6b96 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedApiController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedApiController.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Umbraco.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Umbraco.Web.Common.Controllers; using Umbraco.Web.Common.Filters; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// Provides a base class for authorized auto-routed Umbraco API controllers. diff --git a/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedJsonController.cs b/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedJsonController.cs index 5eaab10417..158c63c063 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedJsonController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedJsonController.cs @@ -1,7 +1,7 @@ -using Umbraco.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Web.Common.Filters; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { /// /// An abstract API controller that only supports JSON and all requests must contain the correct csrf header diff --git a/src/Umbraco.Web.BackOffice/Controllers/UpdateCheckController.cs b/src/Umbraco.Web.BackOffice/Controllers/UpdateCheckController.cs index a720c7656c..4edc9a7fd3 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/UpdateCheckController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/UpdateCheckController.cs @@ -15,7 +15,7 @@ using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] public class UpdateCheckController : UmbracoAuthorizedJsonController diff --git a/src/Umbraco.Web.BackOffice/Controllers/UserGroupEditorAuthorizationHelper.cs b/src/Umbraco.Web.BackOffice/Controllers/UserGroupEditorAuthorizationHelper.cs index c7964ea240..4b759cfaa2 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/UserGroupEditorAuthorizationHelper.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/UserGroupEditorAuthorizationHelper.cs @@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Services; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { internal class UserGroupEditorAuthorizationHelper { diff --git a/src/Umbraco.Web.BackOffice/Controllers/UserGroupsController.cs b/src/Umbraco.Web.BackOffice/Controllers/UserGroupsController.cs index 42dc6dec3e..babff8513a 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/UserGroupsController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/UserGroupsController.cs @@ -4,20 +4,19 @@ using System.Linq; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Mapping; -using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Web.BackOffice.ActionResults; +using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.ActionResults; -using Umbraco.Web.BackOffice.Filters; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] [Authorize(Policy = AuthorizationPolicies.SectionAccessUsers)] diff --git a/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs b/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs index a0848f24ed..58e115e72c 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs @@ -29,20 +29,21 @@ using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Web.BackOffice.ActionResults; +using Umbraco.Cms.Web.BackOffice.Extensions; +using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.ModelBinders; +using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Core; using Umbraco.Core.Persistence; using Umbraco.Core.Security; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.ActionResults; -using Umbraco.Web.BackOffice.Filters; -using Umbraco.Web.BackOffice.ModelBinders; -using Umbraco.Web.BackOffice.Security; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Web.BackOffice.Controllers { [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] [Authorize(Policy = AuthorizationPolicies.SectionAccessUsers)] diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs index 60dd90d3f0..70fabbe27e 100644 --- a/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs +++ b/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs @@ -6,18 +6,15 @@ using Umbraco.Cms.Core.Actions; using Umbraco.Cms.Core.Net; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Serialization; -using Umbraco.Core; +using Umbraco.Cms.Web.BackOffice.Authorization; +using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Core.Security; -using Umbraco.Core.Serialization; -using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Authorization; -using Umbraco.Web.BackOffice.Security; using Umbraco.Web.Common.AspNetCore; using Umbraco.Web.Common.Authorization; using Umbraco.Web.Common.Security; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.DependencyInjection +namespace Umbraco.Extensions { public static class ServiceCollectionExtensions { diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs index 04704cfe2c..05a20b55d3 100644 --- a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs @@ -8,22 +8,20 @@ using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Services; -using Umbraco.Extensions; +using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.BackOffice.Middleware; +using Umbraco.Cms.Web.BackOffice.Routing; +using Umbraco.Cms.Web.BackOffice.Security; +using Umbraco.Cms.Web.BackOffice.Services; +using Umbraco.Cms.Web.BackOffice.Trees; using Umbraco.Infrastructure.DependencyInjection; using Umbraco.Web.BackOffice.Authorization; -using Umbraco.Web.BackOffice.Controllers; -using Umbraco.Web.BackOffice.Filters; -using Umbraco.Web.BackOffice.Middleware; -using Umbraco.Web.BackOffice.Routing; -using Umbraco.Web.BackOffice.Security; -using Umbraco.Web.BackOffice.Services; -using Umbraco.Web.BackOffice.Trees; using Umbraco.Web.Common.Authorization; using Umbraco.Web.Common.DependencyInjection; using Umbraco.Web.WebAssets; -namespace Umbraco.Web.BackOffice.DependencyInjection +namespace Umbraco.Extensions { /// /// Extension methods for for the Umbraco back office diff --git a/src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs index 71cb14eb78..3214162e62 100644 --- a/src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs +++ b/src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs @@ -1,9 +1,10 @@ using System; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; -using Umbraco.Web.BackOffice.Middleware; -using Umbraco.Web.BackOffice.Routing; -using Umbraco.Web.Common.Security; +using Umbraco.Cms.Web.BackOffice.Middleware; +using Umbraco.Cms.Web.BackOffice.Routing; +using Umbraco.Cms.Web.BackOffice.Security; +using Umbraco.Extensions; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.BackOffice/Extensions/ControllerContextExtensions.cs b/src/Umbraco.Web.BackOffice/Extensions/ControllerContextExtensions.cs index ca17d97fc7..98efd7a92d 100644 --- a/src/Umbraco.Web.BackOffice/Extensions/ControllerContextExtensions.cs +++ b/src/Umbraco.Web.BackOffice/Extensions/ControllerContextExtensions.cs @@ -1,14 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Net.Http; -using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.Extensions.DependencyInjection; -namespace Umbraco.Extensions +namespace Umbraco.Cms.Web.BackOffice.Extensions { internal static class ControllerContextExtensions { diff --git a/src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs index 3f9bb9dbf3..934442ea46 100644 --- a/src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs +++ b/src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs @@ -1,23 +1,16 @@ -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Html; -using Microsoft.AspNetCore.Mvc.Rendering; -using Microsoft.AspNetCore.Routing; -using Newtonsoft.Json; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Umbraco.Cms.Core; +using Microsoft.AspNetCore.Html; +using Microsoft.AspNetCore.Mvc.Rendering; +using Newtonsoft.Json; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.WebAssets; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Web.BackOffice.Controllers; -using Umbraco.Web.Models; +using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.BackOffice.Security; +using Umbraco.Extensions; using Umbraco.Web.WebAssets; -using Umbraco.Core; -using Umbraco.Core.Security; -using Umbraco.Web.BackOffice.Security; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.BackOffice/Extensions/HttpContextExtensions.cs b/src/Umbraco.Web.BackOffice/Extensions/HttpContextExtensions.cs index 5bd50bea69..bf9e8f48e0 100644 --- a/src/Umbraco.Web.BackOffice/Extensions/HttpContextExtensions.cs +++ b/src/Umbraco.Web.BackOffice/Extensions/HttpContextExtensions.cs @@ -1,6 +1,5 @@ using Microsoft.AspNetCore.Http; using Umbraco.Cms.Core.Security; -using Umbraco.Core.Security; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.BackOffice/Extensions/ModelStateExtensions.cs b/src/Umbraco.Web.BackOffice/Extensions/ModelStateExtensions.cs index 946bed2e45..2def3c85e9 100644 --- a/src/Umbraco.Web.BackOffice/Extensions/ModelStateExtensions.cs +++ b/src/Umbraco.Web.BackOffice/Extensions/ModelStateExtensions.cs @@ -3,15 +3,13 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ModelBinding; -using Umbraco.Cms.Core; -using Umbraco.Core; -using Umbraco.Web.BackOffice.PropertyEditors.Validation; +using Umbraco.Cms.Web.BackOffice.PropertyEditors.Validation; +using Umbraco.Extensions; -namespace Umbraco.Extensions +namespace Umbraco.Cms.Web.BackOffice.Extensions { internal static class ModelStateExtensions { - /// /// Checks if there are any model errors on any fields containing the prefix /// diff --git a/src/Umbraco.Web.BackOffice/Extensions/WebMappingProfiles.cs b/src/Umbraco.Web.BackOffice/Extensions/WebMappingProfiles.cs index 413c31c218..efc066ea32 100644 --- a/src/Umbraco.Web.BackOffice/Extensions/WebMappingProfiles.cs +++ b/src/Umbraco.Web.BackOffice/Extensions/WebMappingProfiles.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Mapping; -using Umbraco.Web.BackOffice.Mapping; +using Umbraco.Cms.Web.BackOffice.Mapping; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.BackOffice/Filters/AppendCurrentEventMessagesAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/AppendCurrentEventMessagesAttribute.cs index eae37945f7..152f318c06 100644 --- a/src/Umbraco.Web.BackOffice/Filters/AppendCurrentEventMessagesAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/AppendCurrentEventMessagesAttribute.cs @@ -5,9 +5,8 @@ using Microsoft.AspNetCore.Mvc.Filters; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Web; -using Umbraco.Core.Events; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// diff --git a/src/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttribute.cs index 5eafea6540..842e455199 100644 --- a/src/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttribute.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection; using Umbraco.Cms.Core.Security; using Umbraco.Extensions; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// Appends a custom response header to notify the UI that the current user data has been modified diff --git a/src/Umbraco.Web.BackOffice/Filters/CheckIfUserTicketDataIsStaleAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/CheckIfUserTicketDataIsStaleAttribute.cs index 06d34a87f8..1aa71f149a 100644 --- a/src/Umbraco.Web.BackOffice/Filters/CheckIfUserTicketDataIsStaleAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/CheckIfUserTicketDataIsStaleAttribute.cs @@ -15,17 +15,12 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; +using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Core.Scoping; using Umbraco.Core.Security; -using Umbraco.Core.Services; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Security; -using Umbraco.Web.Common.Security; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// diff --git a/src/Umbraco.Web.BackOffice/Filters/ContentModelValidator.cs b/src/Umbraco.Web.BackOffice/Filters/ContentModelValidator.cs index 9242baa07a..a1705bcedf 100644 --- a/src/Umbraco.Web.BackOffice/Filters/ContentModelValidator.cs +++ b/src/Umbraco.Web.BackOffice/Filters/ContentModelValidator.cs @@ -10,13 +10,10 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Services; +using Umbraco.Cms.Web.BackOffice.Extensions; using Umbraco.Extensions; -using Umbraco.Core.Security; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// A base class purely used for logging without generics diff --git a/src/Umbraco.Web.BackOffice/Filters/ContentSaveModelValidator.cs b/src/Umbraco.Web.BackOffice/Filters/ContentSaveModelValidator.cs index 7b4c046e23..28dfcfdb97 100644 --- a/src/Umbraco.Web.BackOffice/Filters/ContentSaveModelValidator.cs +++ b/src/Umbraco.Web.BackOffice/Filters/ContentSaveModelValidator.cs @@ -2,11 +2,8 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// Validator for diff --git a/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs index e1b2277cb2..9fdc8f75f5 100644 --- a/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs @@ -5,21 +5,16 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Actions; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -using Umbraco.Web.BackOffice.Authorization; +using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// Validates the incoming model along with if the user is allowed to perform the diff --git a/src/Umbraco.Web.BackOffice/Filters/DataTypeValidateAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/DataTypeValidateAttribute.cs index 3bb4cf5a70..ccceff1805 100644 --- a/src/Umbraco.Web.BackOffice/Filters/DataTypeValidateAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/DataTypeValidateAttribute.cs @@ -3,20 +3,16 @@ using System.Linq; using System.Net; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Services; +using Umbraco.Cms.Web.BackOffice.Extensions; using Umbraco.Extensions; using Umbraco.Web.Common.ActionsResults; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// An attribute/filter that wires up the persisted entity of the DataTypeSave model and validates the whole request diff --git a/src/Umbraco.Web.BackOffice/Filters/EditorModelEventManager.cs b/src/Umbraco.Web.BackOffice/Filters/EditorModelEventManager.cs index f4175be720..a76b1a4091 100644 --- a/src/Umbraco.Web.BackOffice/Filters/EditorModelEventManager.cs +++ b/src/Umbraco.Web.BackOffice/Filters/EditorModelEventManager.cs @@ -4,9 +4,8 @@ using Umbraco.Cms.Core.Dashboards; using Umbraco.Cms.Core.Editors; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models.ContentEditing; -using Umbraco.Core.Events; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// Used to emit events for editor models in the back office diff --git a/src/Umbraco.Web.BackOffice/Filters/FileUploadCleanupFilterAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/FileUploadCleanupFilterAttribute.cs index 7b3cd695da..49085de977 100644 --- a/src/Umbraco.Web.BackOffice/Filters/FileUploadCleanupFilterAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/FileUploadCleanupFilterAttribute.cs @@ -9,7 +9,7 @@ using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Extensions; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// Checks if the parameter is IHaveUploadedFiles and then deletes any temporary saved files from file uploads diff --git a/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttribute.cs index cfe1b60217..44ccfcb115 100644 --- a/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttribute.cs @@ -9,13 +9,9 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// This inspects the result of the action that returns a collection of content and removes diff --git a/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs index 02231ad61f..23ce54df4e 100644 --- a/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs @@ -13,7 +13,7 @@ using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// This inspects the result of the action that returns a collection of content and removes diff --git a/src/Umbraco.Web.BackOffice/Filters/IsCurrentUserModelFilterAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/IsCurrentUserModelFilterAttribute.cs index 77f7e67fc9..31750f1e66 100644 --- a/src/Umbraco.Web.BackOffice/Filters/IsCurrentUserModelFilterAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/IsCurrentUserModelFilterAttribute.cs @@ -3,10 +3,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; -using Umbraco.Core.Security; -using Umbraco.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.BackOffice.Controllers; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { internal class IsCurrentUserModelFilterAttribute : TypeFilterAttribute { diff --git a/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs index c5151f42d9..f6c70f328c 100644 --- a/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs @@ -1,14 +1,12 @@ -using System; -using System.Buffers; +using System.Buffers; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Options; using Newtonsoft.Json; -using Newtonsoft.Json.Converters; using Newtonsoft.Json.Serialization; using Umbraco.Web.Common.Formatters; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { public class JsonCamelCaseFormatterAttribute : TypeFilterAttribute { diff --git a/src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs index 43aaff1f3c..facdf26ce1 100644 --- a/src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs @@ -7,15 +7,11 @@ using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -using Umbraco.Web.BackOffice.Authorization; +using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// Validates the incoming model diff --git a/src/Umbraco.Web.BackOffice/Filters/MediaSaveModelValidator.cs b/src/Umbraco.Web.BackOffice/Filters/MediaSaveModelValidator.cs index 396b9b7861..7e211773d9 100644 --- a/src/Umbraco.Web.BackOffice/Filters/MediaSaveModelValidator.cs +++ b/src/Umbraco.Web.BackOffice/Filters/MediaSaveModelValidator.cs @@ -2,11 +2,8 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// Validator for diff --git a/src/Umbraco.Web.BackOffice/Filters/MemberSaveModelValidator.cs b/src/Umbraco.Web.BackOffice/Filters/MemberSaveModelValidator.cs index 9c8be48e4f..57fc834e0c 100644 --- a/src/Umbraco.Web.BackOffice/Filters/MemberSaveModelValidator.cs +++ b/src/Umbraco.Web.BackOffice/Filters/MemberSaveModelValidator.cs @@ -11,14 +11,11 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Cms.Web.BackOffice.Extensions; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// Validator for diff --git a/src/Umbraco.Web.BackOffice/Filters/MemberSaveValidationAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/MemberSaveValidationAttribute.cs index 1aadaeca12..e01f9197e1 100644 --- a/src/Umbraco.Web.BackOffice/Filters/MemberSaveValidationAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/MemberSaveValidationAttribute.cs @@ -6,10 +6,8 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// Validates the incoming model diff --git a/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResultAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResultAttribute.cs index 4e84ca7419..325fdfcc7f 100644 --- a/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResultAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResultAttribute.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.DependencyInjection; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.WebAssets; -using Umbraco.Web.BackOffice.ActionResults; +using Umbraco.Cms.Web.BackOffice.ActionResults; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { public class MinifyJavaScriptResultAttribute : ActionFilterAttribute { diff --git a/src/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttribute.cs index 32d8e9d543..d811287b85 100644 --- a/src/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttribute.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Umbraco.Extensions; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { public class OnlyLocalRequestsAttribute : ActionFilterAttribute { diff --git a/src/Umbraco.Web.BackOffice/Filters/OutgoingEditorModelEventAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/OutgoingEditorModelEventAttribute.cs index 85ffa08c59..fe825a1907 100644 --- a/src/Umbraco.Web.BackOffice/Filters/OutgoingEditorModelEventAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/OutgoingEditorModelEventAttribute.cs @@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Web; using Umbraco.Extensions; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// Used to emit outgoing editor model events diff --git a/src/Umbraco.Web.BackOffice/Filters/PrefixlessBodyModelValidatorAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/PrefixlessBodyModelValidatorAttribute.cs index 840149ef14..de23791720 100644 --- a/src/Umbraco.Web.BackOffice/Filters/PrefixlessBodyModelValidatorAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/PrefixlessBodyModelValidatorAttribute.cs @@ -2,7 +2,7 @@ using System.Linq; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// Applying this attribute to any controller will ensure that the parameter name (prefix) is not part of the validation error keys. diff --git a/src/Umbraco.Web.BackOffice/Filters/SetAngularAntiForgeryTokensAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/SetAngularAntiForgeryTokensAttribute.cs index 79aed348e7..543c6204a8 100644 --- a/src/Umbraco.Web.BackOffice/Filters/SetAngularAntiForgeryTokensAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/SetAngularAntiForgeryTokensAttribute.cs @@ -4,11 +4,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; -using Umbraco.Core; -using Umbraco.Web.BackOffice.Security; +using Umbraco.Cms.Web.BackOffice.Security; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// An attribute/filter to set the csrf cookie token based on angular conventions diff --git a/src/Umbraco.Web.BackOffice/Filters/UmbracoRequireHttpsAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/UmbracoRequireHttpsAttribute.cs index cd357f8e0f..b793346eba 100644 --- a/src/Umbraco.Web.BackOffice/Filters/UmbracoRequireHttpsAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/UmbracoRequireHttpsAttribute.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// If Umbraco.Core.UseHttps property in web.config is set to true, this filter will redirect any http access to https. diff --git a/src/Umbraco.Web.BackOffice/Filters/UnhandledExceptionLoggerFilter.cs b/src/Umbraco.Web.BackOffice/Filters/UnhandledExceptionLoggerFilter.cs index ebea90249c..dd955d11f2 100644 --- a/src/Umbraco.Web.BackOffice/Filters/UnhandledExceptionLoggerFilter.cs +++ b/src/Umbraco.Web.BackOffice/Filters/UnhandledExceptionLoggerFilter.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore.Builder; - -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// Applies the UnhandledExceptionLoggerMiddleware to a specific controller diff --git a/src/Umbraco.Web.BackOffice/Filters/UnhandledExceptionLoggerMiddleware.cs b/src/Umbraco.Web.BackOffice/Filters/UnhandledExceptionLoggerMiddleware.cs index e2192f694b..42662cf548 100644 --- a/src/Umbraco.Web.BackOffice/Filters/UnhandledExceptionLoggerMiddleware.cs +++ b/src/Umbraco.Web.BackOffice/Filters/UnhandledExceptionLoggerMiddleware.cs @@ -3,10 +3,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Extensions; using Microsoft.Extensions.Logging; -using Umbraco.Core; using Umbraco.Extensions; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// Logs any unhandled exception. diff --git a/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs index 4fd4f3a08a..316496b58e 100644 --- a/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs @@ -6,11 +6,11 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.ActionResults; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.ActionResults; using Umbraco.Web.Common.ActionsResults; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { internal sealed class UserGroupValidateAttribute : TypeFilterAttribute { diff --git a/src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs index 4b2b581777..8e3c6d97ca 100644 --- a/src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs @@ -7,14 +7,12 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Web; -using Umbraco.Core; +using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Security; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// An attribute/filter to check for the csrf token based on Angular's standard approach diff --git a/src/Umbraco.Web.BackOffice/Filters/ValidationFilterAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/ValidationFilterAttribute.cs index 77d44062d0..b29607a9c7 100644 --- a/src/Umbraco.Web.BackOffice/Filters/ValidationFilterAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/ValidationFilterAttribute.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -namespace Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Web.BackOffice.Filters { /// /// An action filter used to do basic validation against the model and return a result diff --git a/src/Umbraco.Web.BackOffice/HealthChecks/HealthCheckController.cs b/src/Umbraco.Web.BackOffice/HealthChecks/HealthCheckController.cs index 70c066242b..65682f24db 100644 --- a/src/Umbraco.Web.BackOffice/HealthChecks/HealthCheckController.cs +++ b/src/Umbraco.Web.BackOffice/HealthChecks/HealthCheckController.cs @@ -11,13 +11,12 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.HealthChecks; -using Umbraco.Core; -using Umbraco.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.HealthChecks +namespace Umbraco.Cms.Web.BackOffice.HealthChecks { /// /// The API controller used to display the health check info and execute any actions diff --git a/src/Umbraco.Web.BackOffice/Mapping/CommonTreeNodeMapper.cs b/src/Umbraco.Web.BackOffice/Mapping/CommonTreeNodeMapper.cs index a4d8465720..4f4296bbe5 100644 --- a/src/Umbraco.Web.BackOffice/Mapping/CommonTreeNodeMapper.cs +++ b/src/Umbraco.Web.BackOffice/Mapping/CommonTreeNodeMapper.cs @@ -1,14 +1,10 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Routing; -using Microsoft.AspNetCore.Routing; +using Microsoft.AspNetCore.Routing; using Umbraco.Cms.Core.Models; -using Umbraco.Core.Models; +using Umbraco.Cms.Web.BackOffice.Trees; using Umbraco.Extensions; using Umbraco.Web.Common.Controllers; -using Umbraco.Web.BackOffice.Trees; -namespace Umbraco.Web.BackOffice.Mapping +namespace Umbraco.Cms.Web.BackOffice.Mapping { public class CommonTreeNodeMapper { diff --git a/src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs b/src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs index 6b283800d3..797a8ed368 100644 --- a/src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs +++ b/src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs @@ -14,11 +14,11 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.BackOffice.Trees; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Trees; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Mapping +namespace Umbraco.Cms.Web.BackOffice.Mapping { /// /// Declares how model mappings for content diff --git a/src/Umbraco.Web.BackOffice/Mapping/MediaMapDefinition.cs b/src/Umbraco.Web.BackOffice/Mapping/MediaMapDefinition.cs index e9ca69409a..2b654fff48 100644 --- a/src/Umbraco.Web.BackOffice/Mapping/MediaMapDefinition.cs +++ b/src/Umbraco.Web.BackOffice/Mapping/MediaMapDefinition.cs @@ -9,11 +9,11 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Mapping; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Trees; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Trees; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Mapping +namespace Umbraco.Cms.Web.BackOffice.Mapping { /// /// Declares model mappings for media. diff --git a/src/Umbraco.Web.BackOffice/Mapping/MemberMapDefinition.cs b/src/Umbraco.Web.BackOffice/Mapping/MemberMapDefinition.cs index f1941c666e..c17d834226 100644 --- a/src/Umbraco.Web.BackOffice/Mapping/MemberMapDefinition.cs +++ b/src/Umbraco.Web.BackOffice/Mapping/MemberMapDefinition.cs @@ -4,13 +4,10 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Mapping; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Web.Models.Mapping; -using Umbraco.Web.BackOffice.Trees; +using Umbraco.Cms.Web.BackOffice.Trees; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Mapping +namespace Umbraco.Cms.Web.BackOffice.Mapping { /// /// Declares model mappings for members. diff --git a/src/Umbraco.Web.BackOffice/Middleware/BackOfficeExternalLoginProviderErrorMiddleware.cs b/src/Umbraco.Web.BackOffice/Middleware/BackOfficeExternalLoginProviderErrorMiddleware.cs index 1a2d5b20e7..796443bbf6 100644 --- a/src/Umbraco.Web.BackOffice/Middleware/BackOfficeExternalLoginProviderErrorMiddleware.cs +++ b/src/Umbraco.Web.BackOffice/Middleware/BackOfficeExternalLoginProviderErrorMiddleware.cs @@ -4,16 +4,16 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Extensions; using Newtonsoft.Json; -using Umbraco.Core; using Umbraco.Extensions; +using HttpRequestExtensions = Umbraco.Extensions.HttpRequestExtensions; -namespace Umbraco.Web.BackOffice.Middleware +namespace Umbraco.Cms.Web.BackOffice.Middleware { /// /// Used to handle errors registered by external login providers /// /// - /// When an external login provider registers an error with during the OAuth process, + /// When an external login provider registers an error with during the OAuth process, /// this middleware will detect that, store the errors into cookie data and redirect to the back office login so we can read the errors back out. /// public class BackOfficeExternalLoginProviderErrorMiddleware : IMiddleware @@ -21,7 +21,7 @@ namespace Umbraco.Web.BackOffice.Middleware public async Task InvokeAsync(HttpContext context, RequestDelegate next) { var shortCircuit = false; - if (!context.Request.IsClientSideRequest()) + if (!HttpRequestExtensions.IsClientSideRequest(context.Request)) { // check if we have any errors registered var errors = context.GetExternalLoginProviderErrors(); diff --git a/src/Umbraco.Web.BackOffice/Middleware/PreviewAuthenticationMiddleware.cs b/src/Umbraco.Web.BackOffice/Middleware/PreviewAuthenticationMiddleware.cs index 071e0b4f4c..b03769d28b 100644 --- a/src/Umbraco.Web.BackOffice/Middleware/PreviewAuthenticationMiddleware.cs +++ b/src/Umbraco.Web.BackOffice/Middleware/PreviewAuthenticationMiddleware.cs @@ -4,12 +4,10 @@ using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core.Security; -using Umbraco.Core; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Middleware +namespace Umbraco.Cms.Web.BackOffice.Middleware { /// /// Ensures that preview pages (front-end routed) are authenticated with the back office identity appended to the principal alongside any default authentication that takes place diff --git a/src/Umbraco.Web.BackOffice/ModelBinders/BlueprintItemBinder.cs b/src/Umbraco.Web.BackOffice/ModelBinders/BlueprintItemBinder.cs index ca820f5199..eb88cf3748 100644 --- a/src/Umbraco.Web.BackOffice/ModelBinders/BlueprintItemBinder.cs +++ b/src/Umbraco.Web.BackOffice/ModelBinders/BlueprintItemBinder.cs @@ -4,12 +4,8 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Models; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; -using Umbraco.Core.Services.Implement; -namespace Umbraco.Web.BackOffice.ModelBinders +namespace Umbraco.Cms.Web.BackOffice.ModelBinders { internal class BlueprintItemBinder : ContentItemBinder { diff --git a/src/Umbraco.Web.BackOffice/ModelBinders/ContentItemBinder.cs b/src/Umbraco.Web.BackOffice/ModelBinders/ContentItemBinder.cs index c7e1ddb704..82b612c98c 100644 --- a/src/Umbraco.Web.BackOffice/ModelBinders/ContentItemBinder.cs +++ b/src/Umbraco.Web.BackOffice/ModelBinders/ContentItemBinder.cs @@ -6,13 +6,12 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; -using Umbraco.Cms.Core.Models.Mapping; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Controllers; -namespace Umbraco.Web.BackOffice.ModelBinders +namespace Umbraco.Cms.Web.BackOffice.ModelBinders { /// /// The model binder for diff --git a/src/Umbraco.Web.BackOffice/ModelBinders/ContentModelBinderHelper.cs b/src/Umbraco.Web.BackOffice/ModelBinders/ContentModelBinderHelper.cs index 82aff039ac..55d2be84a7 100644 --- a/src/Umbraco.Web.BackOffice/ModelBinders/ContentModelBinderHelper.cs +++ b/src/Umbraco.Web.BackOffice/ModelBinders/ContentModelBinderHelper.cs @@ -1,20 +1,15 @@ using System; using System.IO; -using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.ModelBinding; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Editors; using Umbraco.Cms.Core.Serialization; -using Umbraco.Core; -using Umbraco.Core.Serialization; using Umbraco.Extensions; -using Umbraco.Web.Common.Exceptions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.ModelBinders +namespace Umbraco.Cms.Web.BackOffice.ModelBinders { /// /// Helper methods to bind media/member models diff --git a/src/Umbraco.Web.BackOffice/ModelBinders/FromJsonPathAttribute.cs b/src/Umbraco.Web.BackOffice/ModelBinders/FromJsonPathAttribute.cs index aa33406db3..a27243714f 100644 --- a/src/Umbraco.Web.BackOffice/ModelBinders/FromJsonPathAttribute.cs +++ b/src/Umbraco.Web.BackOffice/ModelBinders/FromJsonPathAttribute.cs @@ -1,8 +1,5 @@ using System; -using System.IO; -using System.Text; using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; @@ -10,7 +7,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Umbraco.Extensions; -namespace Umbraco.Web.BackOffice.ModelBinders +namespace Umbraco.Cms.Web.BackOffice.ModelBinders { /// /// Used to bind a value from an inner json property diff --git a/src/Umbraco.Web.BackOffice/ModelBinders/MediaItemBinder.cs b/src/Umbraco.Web.BackOffice/ModelBinders/MediaItemBinder.cs index 8f524e1b39..7cd4bceaa8 100644 --- a/src/Umbraco.Web.BackOffice/ModelBinders/MediaItemBinder.cs +++ b/src/Umbraco.Web.BackOffice/ModelBinders/MediaItemBinder.cs @@ -7,12 +7,9 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Models; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; -using Umbraco.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.BackOffice.Controllers; -namespace Umbraco.Web.BackOffice.ModelBinders +namespace Umbraco.Cms.Web.BackOffice.ModelBinders { /// /// The model binder for diff --git a/src/Umbraco.Web.BackOffice/ModelBinders/MemberBinder.cs b/src/Umbraco.Web.BackOffice/ModelBinders/MemberBinder.cs index e1d110c309..2221b907a6 100644 --- a/src/Umbraco.Web.BackOffice/ModelBinders/MemberBinder.cs +++ b/src/Umbraco.Web.BackOffice/ModelBinders/MemberBinder.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.ModelBinding; @@ -14,10 +11,9 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Serialization; -using Umbraco.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.BackOffice.Controllers; -namespace Umbraco.Web.BackOffice.ModelBinders +namespace Umbraco.Cms.Web.BackOffice.ModelBinders { /// /// The model binder for diff --git a/src/Umbraco.Web.BackOffice/Profiling/WebProfilingController.cs b/src/Umbraco.Web.BackOffice/Profiling/WebProfilingController.cs index 5fc98d8f0e..8cb456256e 100644 --- a/src/Umbraco.Web.BackOffice/Profiling/WebProfilingController.cs +++ b/src/Umbraco.Web.BackOffice/Profiling/WebProfilingController.cs @@ -1,14 +1,11 @@ -using Umbraco.Core; -using Umbraco.Web.BackOffice.Filters; -using Umbraco.Web.BackOffice.Controllers; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Controllers; -using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Authorization; using Umbraco.Cms.Core.Hosting; +using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Profiling +namespace Umbraco.Cms.Web.BackOffice.Profiling { /// /// The API controller used to display the state of the web profiler diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs index 13e1fc7756..40172e258c 100644 --- a/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs +++ b/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs @@ -5,12 +5,12 @@ using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.PropertyEditors +namespace Umbraco.Cms.Web.BackOffice.PropertyEditors { [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] public class NestedContentController : UmbracoAuthorizedJsonController diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/RichTextPreValueController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/RichTextPreValueController.cs index b8c7bedeed..734bb5ad77 100644 --- a/src/Umbraco.Web.BackOffice/PropertyEditors/RichTextPreValueController.cs +++ b/src/Umbraco.Web.BackOffice/PropertyEditors/RichTextPreValueController.cs @@ -4,12 +4,12 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models.ContentEditing; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.PropertyEditors +namespace Umbraco.Cms.Web.BackOffice.PropertyEditors { /// /// ApiController to provide RTE configuration with available plugins and commands from the RTE config diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs index 454e35683c..5e64d4f56e 100644 --- a/src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs +++ b/src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs @@ -3,12 +3,11 @@ using System.Text.RegularExpressions; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Media.EmbedProviders; -using Umbraco.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Web.Common.Attributes; -using Umbraco.Core; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.PropertyEditors +namespace Umbraco.Cms.Web.BackOffice.PropertyEditors { /// /// A controller used for the embed dialog diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs index 554f12c559..7d686690e6 100644 --- a/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs +++ b/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PublishedCache; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.PropertyEditors +namespace Umbraco.Cms.Web.BackOffice.PropertyEditors { /// /// A controller used for type-ahead values for tags diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ContentPropertyValidationResult.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ContentPropertyValidationResult.cs index 6f4e99c8df..5cd434bd2d 100644 --- a/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ContentPropertyValidationResult.cs +++ b/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ContentPropertyValidationResult.cs @@ -1,8 +1,8 @@ -using Newtonsoft.Json; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using Newtonsoft.Json; using Umbraco.Cms.Core.PropertyEditors.Validation; -namespace Umbraco.Web.BackOffice.PropertyEditors.Validation +namespace Umbraco.Cms.Web.BackOffice.PropertyEditors.Validation { /// /// Custom for content properties diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ValidationResultConverter.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ValidationResultConverter.cs index e49a9ae3e3..4be6b17b32 100644 --- a/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ValidationResultConverter.cs +++ b/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ValidationResultConverter.cs @@ -1,16 +1,15 @@ -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using Newtonsoft.Json.Serialization; -using System; +using System; using System.ComponentModel.DataAnnotations; using System.Linq; using Microsoft.AspNetCore.Mvc.ModelBinding; -using Umbraco.Cms.Core; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using Newtonsoft.Json.Serialization; using Umbraco.Cms.Core.PropertyEditors.Validation; -using Umbraco.Core; +using Umbraco.Cms.Web.BackOffice.Extensions; using Umbraco.Extensions; -namespace Umbraco.Web.BackOffice.PropertyEditors.Validation +namespace Umbraco.Cms.Web.BackOffice.PropertyEditors.Validation { /// /// Custom json converter for and diff --git a/src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs b/src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs index 5983203f19..ce5b2e0880 100644 --- a/src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs +++ b/src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs @@ -2,18 +2,17 @@ using System; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Options; using Umbraco.Cms.Core; -using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web.Mvc; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.Common.Controllers; using Umbraco.Web.Common.Routing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Routing +namespace Umbraco.Cms.Web.BackOffice.Routing { /// /// Creates routes for the back office area diff --git a/src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs b/src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs index 26a60a002f..fc80299149 100644 --- a/src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs +++ b/src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs @@ -2,17 +2,16 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Options; using Umbraco.Cms.Core; -using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.BackOffice.SignalR; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Controllers; -using Umbraco.Web.BackOffice.SignalR; using Umbraco.Web.Common.Routing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Routing +namespace Umbraco.Cms.Web.BackOffice.Routing { /// /// Creates routes for the preview hub diff --git a/src/Umbraco.Web.BackOffice/Security/AutoLinkSignInResult.cs b/src/Umbraco.Web.BackOffice/Security/AutoLinkSignInResult.cs index 54f409e6f8..3da2553d04 100644 --- a/src/Umbraco.Web.BackOffice/Security/AutoLinkSignInResult.cs +++ b/src/Umbraco.Web.BackOffice/Security/AutoLinkSignInResult.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Identity; -namespace Umbraco.Web.Common.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// Result returned from signing in when auto-linking takes place diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgery.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgery.cs index 7cf0c1093c..396387f04e 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgery.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgery.cs @@ -1,14 +1,13 @@ -using Microsoft.AspNetCore.Antiforgery; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Antiforgery; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; -using System.Linq; -using System.Threading.Tasks; using Umbraco.Cms.Core; -using Umbraco.Core; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilder.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilder.cs index 60018628a8..5ccd1c0aa1 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilder.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilder.cs @@ -1,12 +1,11 @@ +using System; using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; -using System; -using Umbraco.Core; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// Custom used to associate external logins with umbraco external login options diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeCookieManager.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeCookieManager.cs index f7515680e6..a05af07bb6 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeCookieManager.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeCookieManager.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; using Umbraco.Extensions; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// A custom cookie manager that is used to read the cookie from the request. diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProvider.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProvider.cs index 18e5b066dc..ff2a64f155 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProvider.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProvider.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// An external login (OAuth) provider for the back office diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs index b6c1c7f2d2..fa1c1fe487 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs @@ -1,7 +1,4 @@ -using System; -using System.Runtime.Serialization; - -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { @@ -11,7 +8,7 @@ namespace Umbraco.Web.BackOffice.Security public class BackOfficeExternalLoginProviderOptions { public BackOfficeExternalLoginProviderOptions( - string buttonStyle, string icon, + string buttonStyle, string icon, ExternalSignInAutoLinkOptions autoLinkOptions = null, bool denyLocalLogin = false, bool autoRedirectLoginToExternalProvider = false, diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviders.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviders.cs index 21c94308dd..7ecb4e2829 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviders.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviders.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// public class BackOfficeExternalLoginProviders : IBackOfficeExternalLoginProviders diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginsBuilder.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginsBuilder.cs index 402ad8b948..daea904a49 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginsBuilder.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginsBuilder.cs @@ -1,7 +1,7 @@ -using Microsoft.Extensions.DependencyInjection; -using System; +using System; +using Microsoft.Extensions.DependencyInjection; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// Used to add back office login providers diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficePasswordHasher.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficePasswordHasher.cs index e850eb4336..17190b1b37 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficePasswordHasher.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficePasswordHasher.cs @@ -7,7 +7,7 @@ using Umbraco.Core.Security; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// A password hasher for back office users diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeSecureDataFormat.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeSecureDataFormat.cs index 2866047116..8df128661b 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeSecureDataFormat.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeSecureDataFormat.cs @@ -1,10 +1,9 @@ -using Microsoft.AspNetCore.Authentication; -using System; +using System; using System.Security.Claims; +using Microsoft.AspNetCore.Authentication; using Umbraco.Cms.Core.Security; -using Umbraco.Core.Security; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidator.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidator.cs index abd0af1353..9037f39da1 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidator.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidator.cs @@ -1,14 +1,10 @@ -using System; -using System.Security.Claims; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Umbraco.Core.Security; -using Umbraco.Web.Common.Security; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidatorOptions.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidatorOptions.cs index 55d4a9cb94..bf9a17b71b 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidatorOptions.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidatorOptions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Identity; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// Custom for the back office diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeSessionIdValidator.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeSessionIdValidator.cs index 7acca4acba..2631d6c900 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeSessionIdValidator.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeSessionIdValidator.cs @@ -8,14 +8,12 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; -using Umbraco.Core; using Umbraco.Core.Security; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// Used to validate a cookie against a user's session id diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs index fd919a87c1..9f1c53df2c 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs @@ -1,25 +1,22 @@ -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Identity; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; -using Umbraco.Cms.Core; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Identity; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; -using Umbraco.Core; -using Umbraco.Core.Configuration; using Umbraco.Core.Security; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Security; +using Umbraco.Web.Common.Security; -namespace Umbraco.Web.Common.Security +namespace Umbraco.Cms.Web.BackOffice.Security { - using Constants = Cms.Core.Constants; + using Constants = Core.Constants; public class BackOfficeSignInManager : SignInManager, IBackOfficeSignInManager { diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs index c480b06fa3..e287efe56b 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs @@ -7,8 +7,9 @@ using Umbraco.Cms.Core.Services; using Umbraco.Core.Compose; using Umbraco.Core.Security; using Umbraco.Extensions; +using Umbraco.Web.Common.Security; -namespace Umbraco.Web.Common.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// Binds to events to write audit logs for the diff --git a/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs b/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs index b7f6a8a2ea..03807fd70d 100644 --- a/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs +++ b/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs @@ -5,11 +5,9 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Umbraco.Cms.Core; -using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Net; @@ -17,16 +15,10 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Configuration; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using Umbraco.Extensions; -using Umbraco.Web.Common.Security; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// Used to configure for the back office authentication type diff --git a/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeIdentityOptions.cs b/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeIdentityOptions.cs index c9e7acd9d1..052bc35a64 100644 --- a/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeIdentityOptions.cs +++ b/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeIdentityOptions.cs @@ -4,12 +4,10 @@ using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; -using Umbraco.Core; -using Umbraco.Core.Configuration; using Umbraco.Core.Security; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// Used to configure for the Umbraco Back office diff --git a/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeSecurityStampValidatorOptions.cs b/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeSecurityStampValidatorOptions.cs index 1facf094d1..88099b4c6e 100644 --- a/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeSecurityStampValidatorOptions.cs +++ b/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeSecurityStampValidatorOptions.cs @@ -1,7 +1,7 @@ -using Microsoft.Extensions.Options; -using System; +using System; +using Microsoft.Extensions.Options; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// Configures the back office security stamp options diff --git a/src/Umbraco.Web.BackOffice/Security/ExternalSignInAutoLinkOptions.cs b/src/Umbraco.Web.BackOffice/Security/ExternalSignInAutoLinkOptions.cs index dbfc14d723..44a83cfeb8 100644 --- a/src/Umbraco.Web.BackOffice/Security/ExternalSignInAutoLinkOptions.cs +++ b/src/Umbraco.Web.BackOffice/Security/ExternalSignInAutoLinkOptions.cs @@ -1,11 +1,11 @@ -using Microsoft.AspNetCore.Identity; -using System; +using System; using System.Runtime.Serialization; +using Microsoft.AspNetCore.Identity; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Core.Security; using SecurityConstants = Umbraco.Cms.Core.Constants.Security; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// Options used to configure auto-linking external OAuth providers diff --git a/src/Umbraco.Web.BackOffice/Security/IBackOfficeAntiforgery.cs b/src/Umbraco.Web.BackOffice/Security/IBackOfficeAntiforgery.cs index 38bc20f57f..ded1374db2 100644 --- a/src/Umbraco.Web.BackOffice/Security/IBackOfficeAntiforgery.cs +++ b/src/Umbraco.Web.BackOffice/Security/IBackOfficeAntiforgery.cs @@ -1,10 +1,8 @@ -using Microsoft.AspNetCore.Antiforgery; +using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using System.Threading.Tasks; using Umbraco.Cms.Core; -using Umbraco.Core; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// Antiforgery implementation for the Umbraco back office diff --git a/src/Umbraco.Web.BackOffice/Security/IBackOfficeExternalLoginProviders.cs b/src/Umbraco.Web.BackOffice/Security/IBackOfficeExternalLoginProviders.cs index ff22b91b0a..d47873f3cd 100644 --- a/src/Umbraco.Web.BackOffice/Security/IBackOfficeExternalLoginProviders.cs +++ b/src/Umbraco.Web.BackOffice/Security/IBackOfficeExternalLoginProviders.cs @@ -1,9 +1,6 @@ -using Microsoft.AspNetCore.Authentication.OAuth; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// diff --git a/src/Umbraco.Web.BackOffice/Security/IBackOfficeSignInManager.cs b/src/Umbraco.Web.BackOffice/Security/IBackOfficeSignInManager.cs index 669ca21239..7b18f4b04f 100644 --- a/src/Umbraco.Web.BackOffice/Security/IBackOfficeSignInManager.cs +++ b/src/Umbraco.Web.BackOffice/Security/IBackOfficeSignInManager.cs @@ -1,11 +1,11 @@ -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Identity; -using System.Collections.Generic; +using System.Collections.Generic; using System.Security.Claims; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Identity; using Umbraco.Core.Security; -namespace Umbraco.Web.Common.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// A for the back office with a diff --git a/src/Umbraco.Web.BackOffice/Security/IBackOfficeTwoFactorOptions.cs b/src/Umbraco.Web.BackOffice/Security/IBackOfficeTwoFactorOptions.cs index a05d71f3cb..291781fb23 100644 --- a/src/Umbraco.Web.BackOffice/Security/IBackOfficeTwoFactorOptions.cs +++ b/src/Umbraco.Web.BackOffice/Security/IBackOfficeTwoFactorOptions.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { /// /// Options used to control 2FA for the Umbraco back office diff --git a/src/Umbraco.Web.BackOffice/Security/NoopBackOfficeTwoFactorOptions.cs b/src/Umbraco.Web.BackOffice/Security/NoopBackOfficeTwoFactorOptions.cs index bbc0b3e049..05cc7970b4 100644 --- a/src/Umbraco.Web.BackOffice/Security/NoopBackOfficeTwoFactorOptions.cs +++ b/src/Umbraco.Web.BackOffice/Security/NoopBackOfficeTwoFactorOptions.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { public class NoopBackOfficeTwoFactorOptions : IBackOfficeTwoFactorOptions { diff --git a/src/Umbraco.Web.BackOffice/Security/PasswordChanger.cs b/src/Umbraco.Web.BackOffice/Security/PasswordChanger.cs index 0863f87bdb..e5bbaf3845 100644 --- a/src/Umbraco.Web.BackOffice/Security/PasswordChanger.cs +++ b/src/Umbraco.Web.BackOffice/Security/PasswordChanger.cs @@ -4,15 +4,12 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Core.Security; using Umbraco.Extensions; -using Umbraco.Web.Models; using Constants = Umbraco.Cms.Core.Constants; using IUser = Umbraco.Cms.Core.Models.Membership.IUser; -namespace Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Web.BackOffice.Security { internal class PasswordChanger { diff --git a/src/Umbraco.Web.BackOffice/Services/IconService.cs b/src/Umbraco.Web.BackOffice/Services/IconService.cs index 627705a5d0..e80fe24894 100644 --- a/src/Umbraco.Web.BackOffice/Services/IconService.cs +++ b/src/Umbraco.Web.BackOffice/Services/IconService.cs @@ -10,7 +10,7 @@ using Umbraco.Cms.Core.Services; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Services +namespace Umbraco.Cms.Web.BackOffice.Services { public class IconService : IIconService { diff --git a/src/Umbraco.Web.BackOffice/SignalR/IPreviewHub.cs b/src/Umbraco.Web.BackOffice/SignalR/IPreviewHub.cs index 810124010c..1123bc6b16 100644 --- a/src/Umbraco.Web.BackOffice/SignalR/IPreviewHub.cs +++ b/src/Umbraco.Web.BackOffice/SignalR/IPreviewHub.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace Umbraco.Web.BackOffice.SignalR +namespace Umbraco.Cms.Web.BackOffice.SignalR { public interface IPreviewHub { diff --git a/src/Umbraco.Web.BackOffice/SignalR/PreviewHub.cs b/src/Umbraco.Web.BackOffice/SignalR/PreviewHub.cs index e5caea552a..38ab3b478d 100644 --- a/src/Umbraco.Web.BackOffice/SignalR/PreviewHub.cs +++ b/src/Umbraco.Web.BackOffice/SignalR/PreviewHub.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.SignalR; -namespace Umbraco.Web.BackOffice.SignalR +namespace Umbraco.Cms.Web.BackOffice.SignalR { public class PreviewHub : Hub { } diff --git a/src/Umbraco.Web.BackOffice/SignalR/PreviewHubComponent.cs b/src/Umbraco.Web.BackOffice/SignalR/PreviewHubComponent.cs index abed0e2545..00d3dc8013 100644 --- a/src/Umbraco.Web.BackOffice/SignalR/PreviewHubComponent.cs +++ b/src/Umbraco.Web.BackOffice/SignalR/PreviewHubComponent.cs @@ -3,11 +3,8 @@ using Microsoft.AspNetCore.SignalR; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Sync; -using Umbraco.Core.Cache; -using Umbraco.Core.Sync; -using Umbraco.Web.Cache; -namespace Umbraco.Web.BackOffice.SignalR +namespace Umbraco.Cms.Web.BackOffice.SignalR { public class PreviewHubComponent : IComponent { diff --git a/src/Umbraco.Web.BackOffice/SignalR/PreviewHubComposer.cs b/src/Umbraco.Web.BackOffice/SignalR/PreviewHubComposer.cs index 162d76090e..18b8f90825 100644 --- a/src/Umbraco.Web.BackOffice/SignalR/PreviewHubComposer.cs +++ b/src/Umbraco.Web.BackOffice/SignalR/PreviewHubComposer.cs @@ -1,8 +1,7 @@ using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.DependencyInjection; -using Umbraco.Core; -namespace Umbraco.Web.BackOffice.SignalR +namespace Umbraco.Cms.Web.BackOffice.SignalR { public class PreviewHubComposer : ComponentComposer, ICoreComposer { diff --git a/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs index 06fcc75de9..3add8bfadc 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs @@ -8,13 +8,11 @@ using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Primitives; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Services; +using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.BackOffice.Extensions; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Filters; using Umbraco.Web.Common.ModelBinders; @@ -22,7 +20,7 @@ using Umbraco.Web.Models.Trees; using static Umbraco.Cms.Core.Constants.Web.Routing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { /// /// Used to return tree root nodes diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs index 00fef1fb35..b33d436c02 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs @@ -15,7 +15,7 @@ using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { /// /// The content blueprint tree controller diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs index 50b309d0e3..82b93e5d6b 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs @@ -23,7 +23,7 @@ using Umbraco.Web.Common.Authorization; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Authorize(Policy = AuthorizationPolicies.SectionAccessForContentTree)] [Tree(Constants.Applications.Content, Constants.Trees.Content)] diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs index fdb609f80e..1ac4cecae1 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs @@ -13,16 +13,11 @@ using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using Umbraco.Extensions; using Umbraco.Web.Common.ModelBinders; -using Umbraco.Web.Models.Trees; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { public abstract class ContentTreeControllerBase : TreeController, ITreeNodeController { diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs index ed57f7001e..16da4f9857 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs @@ -17,7 +17,7 @@ using Umbraco.Web.Common.Authorization; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)] [Tree(Constants.Applications.Settings, Constants.Trees.DocumentTypes, SortOrder = 0, TreeGroup = Constants.Trees.Groups.Settings)] diff --git a/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs index 9f1fd2b715..c108456f1b 100644 --- a/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs @@ -17,7 +17,7 @@ using Umbraco.Web.Common.Authorization; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Authorize(Policy = AuthorizationPolicies.TreeAccessDataTypes)] [Tree(Constants.Applications.Settings, Constants.Trees.DataTypes, SortOrder = 3, TreeGroup = Constants.Trees.Groups.Settings)] diff --git a/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs index e70e012a56..d6a1b4d14a 100644 --- a/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs @@ -14,7 +14,7 @@ using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { // We are allowed to see the dictionary tree, if we are allowed to manage templates, such that se can use the diff --git a/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs index 148fbfdac2..fffa767ad0 100644 --- a/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs @@ -13,7 +13,7 @@ using Umbraco.Cms.Core.Trees; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { public abstract class FileSystemTreeController : TreeController { diff --git a/src/Umbraco.Web.BackOffice/Trees/FilesTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/FilesTreeController.cs index 150967ec76..e324cddfbc 100644 --- a/src/Umbraco.Web.BackOffice/Trees/FilesTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/FilesTreeController.cs @@ -2,12 +2,9 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Logging; -using Umbraco.Core.Services; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Tree(Constants.Applications.Settings, "files", TreeTitle = "Files", TreeUse = TreeUse.Dialog)] [CoreTree] diff --git a/src/Umbraco.Web.BackOffice/Trees/ITreeNodeController.cs b/src/Umbraco.Web.BackOffice/Trees/ITreeNodeController.cs index c8cba15409..45436e2ebd 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ITreeNodeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ITreeNodeController.cs @@ -1,10 +1,9 @@ -using Umbraco.Web.Models.Trees; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Trees; using Umbraco.Web.Common.ModelBinders; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { /// /// Represents an TreeNodeController diff --git a/src/Umbraco.Web.BackOffice/Trees/LanguageTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/LanguageTreeController.cs index e4a6b4bf52..3655c9e963 100644 --- a/src/Umbraco.Web.BackOffice/Trees/LanguageTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/LanguageTreeController.cs @@ -4,14 +4,11 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Services; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Trees; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Authorize(Policy = AuthorizationPolicies.TreeAccessLanguages)] [Tree(Constants.Applications.Settings, Constants.Trees.Languages, SortOrder = 11, TreeGroup = Constants.Trees.Groups.Settings)] diff --git a/src/Umbraco.Web.BackOffice/Trees/LogViewerTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/LogViewerTreeController.cs index c9e69c324d..a850706754 100644 --- a/src/Umbraco.Web.BackOffice/Trees/LogViewerTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/LogViewerTreeController.cs @@ -4,14 +4,11 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Services; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Trees; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Authorize(Policy = AuthorizationPolicies.TreeAccessLogs)] [Tree(Constants.Applications.Settings, Constants.Trees.LogViewer, SortOrder= 9, TreeGroup = Constants.Trees.Groups.Settings)] diff --git a/src/Umbraco.Web.BackOffice/Trees/MacrosTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MacrosTreeController.cs index 7218f8d0c8..63773a3b4b 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MacrosTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MacrosTreeController.cs @@ -7,14 +7,11 @@ using Umbraco.Cms.Core.Actions; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Services; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Trees; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Authorize(Policy = AuthorizationPolicies.TreeAccessMacros)] [Tree(Constants.Applications.Settings, Constants.Trees.Macros, TreeTitle = "Macros", SortOrder = 4, TreeGroup = Constants.Trees.Groups.Settings)] diff --git a/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs index af109e0558..c9cbc1fd21 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs @@ -20,7 +20,7 @@ using Umbraco.Web.Common.Authorization; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Authorize(Policy = AuthorizationPolicies.SectionAccessForMediaTree)] [Tree(Constants.Applications.Media, Constants.Trees.Media)] diff --git a/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs index a881ab30c1..6ef8a8a7b9 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs @@ -17,7 +17,7 @@ using Umbraco.Web.Common.Authorization; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)] [Tree(Constants.Applications.Settings, Constants.Trees.MediaTypes, SortOrder = 1, TreeGroup = Constants.Trees.Groups.Settings)] diff --git a/src/Umbraco.Web.BackOffice/Trees/MemberGroupTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MemberGroupTreeController.cs index 14e0370486..1c483e9cb2 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MemberGroupTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MemberGroupTreeController.cs @@ -6,14 +6,11 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Services; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Trees; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Authorize(Policy = AuthorizationPolicies.TreeAccessMemberGroups)] [Tree(Constants.Applications.Members, Constants.Trees.MemberGroups, SortOrder = 1)] diff --git a/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs index c280e46ab2..7b465d77a5 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs @@ -12,19 +12,14 @@ using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Umbraco.Web.Common.ModelBinders; -using Umbraco.Web.Models.Trees; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Authorize(Policy = AuthorizationPolicies.SectionAccessForMemberTree)] [Tree(Constants.Applications.Members, Constants.Trees.Members, SortOrder = 0)] diff --git a/src/Umbraco.Web.BackOffice/Trees/MemberTypeAndGroupTreeControllerBase.cs b/src/Umbraco.Web.BackOffice/Trees/MemberTypeAndGroupTreeControllerBase.cs index 4b705c7e31..6ae1b040f1 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MemberTypeAndGroupTreeControllerBase.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MemberTypeAndGroupTreeControllerBase.cs @@ -6,13 +6,10 @@ using Umbraco.Cms.Core.Actions; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Services; using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Models.Trees; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [PluginController(Constants.Web.Mvc.BackOfficeTreeArea)] [CoreTree] diff --git a/src/Umbraco.Web.BackOffice/Trees/MemberTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MemberTypeTreeController.cs index 6785dbe2ca..a86a5427f8 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MemberTypeTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MemberTypeTreeController.cs @@ -8,16 +8,12 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Trees; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [CoreTree] [Authorize(Policy = AuthorizationPolicies.TreeAccessMemberTypes)] diff --git a/src/Umbraco.Web.BackOffice/Trees/MenuRenderingEventArgs.cs b/src/Umbraco.Web.BackOffice/Trees/MenuRenderingEventArgs.cs index b109a799b6..5ec827eb4a 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MenuRenderingEventArgs.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MenuRenderingEventArgs.cs @@ -1,8 +1,7 @@ using Microsoft.AspNetCore.Http; using Umbraco.Cms.Core.Trees; -using Umbraco.Web.Models.Trees; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { public class MenuRenderingEventArgs : TreeRenderingEventArgs { diff --git a/src/Umbraco.Web.BackOffice/Trees/PackagesTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/PackagesTreeController.cs index d396c9640c..864f5aafc1 100644 --- a/src/Umbraco.Web.BackOffice/Trees/PackagesTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/PackagesTreeController.cs @@ -4,14 +4,11 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Services; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Trees; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Authorize(Policy = AuthorizationPolicies.TreeAccessPackages)] [Tree(Constants.Applications.Packages, Constants.Trees.Packages, SortOrder = 0, IsSingleNodeTree = true)] diff --git a/src/Umbraco.Web.BackOffice/Trees/PartialViewMacrosTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/PartialViewMacrosTreeController.cs index 32dbeabc4c..2e62302b96 100644 --- a/src/Umbraco.Web.BackOffice/Trees/PartialViewMacrosTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/PartialViewMacrosTreeController.cs @@ -3,13 +3,11 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core.Services; -using Umbraco.Web.BackOffice.Filters; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { /// /// Tree for displaying partial view macros in the developer app diff --git a/src/Umbraco.Web.BackOffice/Trees/PartialViewsTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/PartialViewsTreeController.cs index 231437ef5c..0e4aa41f0c 100644 --- a/src/Umbraco.Web.BackOffice/Trees/PartialViewsTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/PartialViewsTreeController.cs @@ -3,12 +3,11 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core.Services; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { /// /// Tree for displaying partial views in the settings app diff --git a/src/Umbraco.Web.BackOffice/Trees/RelationTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/RelationTypeTreeController.cs index 58cf09187b..a012d757c9 100644 --- a/src/Umbraco.Web.BackOffice/Trees/RelationTypeTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/RelationTypeTreeController.cs @@ -12,7 +12,7 @@ using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Authorize(Policy = AuthorizationPolicies.TreeAccessRelationTypes)] [Tree(Constants.Applications.Settings, Constants.Trees.RelationTypes, SortOrder = 5, TreeGroup = Constants.Trees.Groups.Settings)] diff --git a/src/Umbraco.Web.BackOffice/Trees/ScriptsTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ScriptsTreeController.cs index 9b0b0d82ec..7b0f8a7574 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ScriptsTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ScriptsTreeController.cs @@ -2,12 +2,9 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Services; -using Umbraco.Web.BackOffice.Trees; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [CoreTree] [Tree(Constants.Applications.Settings, Constants.Trees.Scripts, TreeTitle = "Scripts", SortOrder = 10, TreeGroup = Constants.Trees.Groups.Templating)] diff --git a/src/Umbraco.Web.BackOffice/Trees/StylesheetsTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/StylesheetsTreeController.cs index dfe1877f7f..36d61a6f42 100644 --- a/src/Umbraco.Web.BackOffice/Trees/StylesheetsTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/StylesheetsTreeController.cs @@ -2,11 +2,9 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Services; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [CoreTree] [Tree(Constants.Applications.Settings, Constants.Trees.Stylesheets, TreeTitle = "Stylesheets", SortOrder = 9, TreeGroup = Constants.Trees.Groups.Templating)] diff --git a/src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs index d5760c1ed2..f2333b7228 100644 --- a/src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs @@ -12,17 +12,13 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Trees; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Authorize(Policy = AuthorizationPolicies.TreeAccessTemplates)] [Tree(Constants.Applications.Settings, Constants.Trees.Templates, SortOrder = 6, TreeGroup = Constants.Trees.Groups.Templating)] diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeAttribute.cs b/src/Umbraco.Web.BackOffice/Trees/TreeAttribute.cs index c43901b226..3a6f9314e3 100644 --- a/src/Umbraco.Web.BackOffice/Trees/TreeAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Trees/TreeAttribute.cs @@ -1,7 +1,7 @@ using System; using Umbraco.Cms.Core.Trees; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { /// /// Identifies a section tree. diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeCollectionBuilder.cs b/src/Umbraco.Web.BackOffice/Trees/TreeCollectionBuilder.cs index 7e23abb90f..2257f80d88 100644 --- a/src/Umbraco.Web.BackOffice/Trees/TreeCollectionBuilder.cs +++ b/src/Umbraco.Web.BackOffice/Trees/TreeCollectionBuilder.cs @@ -5,7 +5,7 @@ using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Trees; using Umbraco.Extensions; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { /// /// Builds a . diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeController.cs b/src/Umbraco.Web.BackOffice/Trees/TreeController.cs index 7b278c76af..fd5ee6f8d3 100644 --- a/src/Umbraco.Web.BackOffice/Trees/TreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/TreeController.cs @@ -5,7 +5,7 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; using Umbraco.Extensions; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { /// /// The base controller for all tree requests diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeControllerBase.cs b/src/Umbraco.Web.BackOffice/Trees/TreeControllerBase.cs index c29400f879..51db96d3ee 100644 --- a/src/Umbraco.Web.BackOffice/Trees/TreeControllerBase.cs +++ b/src/Umbraco.Web.BackOffice/Trees/TreeControllerBase.cs @@ -7,17 +7,13 @@ using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Events; -using Umbraco.Core.Models; +using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.Common.Filters; using Umbraco.Web.Common.ModelBinders; -using Umbraco.Web.Models.Trees; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { /// /// A base controller reference for non-attributed trees (un-registered). diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeNodeRenderingEventArgs.cs b/src/Umbraco.Web.BackOffice/Trees/TreeNodeRenderingEventArgs.cs index 1382d2d56a..afd065ffa4 100644 --- a/src/Umbraco.Web.BackOffice/Trees/TreeNodeRenderingEventArgs.cs +++ b/src/Umbraco.Web.BackOffice/Trees/TreeNodeRenderingEventArgs.cs @@ -1,8 +1,7 @@ using Microsoft.AspNetCore.Http; using Umbraco.Cms.Core.Trees; -using Umbraco.Web.Models.Trees; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { public class TreeNodeRenderingEventArgs : TreeRenderingEventArgs { diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeNodesRenderingEventArgs.cs b/src/Umbraco.Web.BackOffice/Trees/TreeNodesRenderingEventArgs.cs index 5a782e0275..f0d29a7901 100644 --- a/src/Umbraco.Web.BackOffice/Trees/TreeNodesRenderingEventArgs.cs +++ b/src/Umbraco.Web.BackOffice/Trees/TreeNodesRenderingEventArgs.cs @@ -1,8 +1,7 @@ using Microsoft.AspNetCore.Http; using Umbraco.Cms.Core.Trees; -using Umbraco.Web.Models.Trees; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { public class TreeNodesRenderingEventArgs : TreeRenderingEventArgs { diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeQueryStringParameters.cs b/src/Umbraco.Web.BackOffice/Trees/TreeQueryStringParameters.cs index 80fba4bb34..9497d69dab 100644 --- a/src/Umbraco.Web.BackOffice/Trees/TreeQueryStringParameters.cs +++ b/src/Umbraco.Web.BackOffice/Trees/TreeQueryStringParameters.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { /// /// Common query string parameters used for tree query strings diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeRenderingEventArgs.cs b/src/Umbraco.Web.BackOffice/Trees/TreeRenderingEventArgs.cs index a132e52dad..9d8795938f 100644 --- a/src/Umbraco.Web.BackOffice/Trees/TreeRenderingEventArgs.cs +++ b/src/Umbraco.Web.BackOffice/Trees/TreeRenderingEventArgs.cs @@ -1,7 +1,7 @@ using System; using Microsoft.AspNetCore.Http; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { public class TreeRenderingEventArgs : EventArgs { diff --git a/src/Umbraco.Web.BackOffice/Trees/UrlHelperExtensions.cs b/src/Umbraco.Web.BackOffice/Trees/UrlHelperExtensions.cs index 8622a60c2e..9d996d7dcb 100644 --- a/src/Umbraco.Web.BackOffice/Trees/UrlHelperExtensions.cs +++ b/src/Umbraco.Web.BackOffice/Trees/UrlHelperExtensions.cs @@ -5,10 +5,9 @@ using System.Text; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; -using Umbraco.Core; -using Umbraco.Web.BackOffice.Trees; +using Umbraco.Extensions; -namespace Umbraco.Extensions +namespace Umbraco.Cms.Web.BackOffice.Trees { public static class UrlHelperExtensions { diff --git a/src/Umbraco.Web.BackOffice/Trees/UserTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/UserTreeController.cs index a6e4e75f07..23b811f295 100644 --- a/src/Umbraco.Web.BackOffice/Trees/UserTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/UserTreeController.cs @@ -4,14 +4,11 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Services; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Trees; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.BackOffice.Trees +namespace Umbraco.Cms.Web.BackOffice.Trees { [Authorize(Policy = AuthorizationPolicies.TreeAccessUsers)] [Tree(Constants.Applications.Users, Constants.Trees.Users, SortOrder = 0, IsSingleNodeTree = true)] diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj index 48d25841fd..8a1a0ebcdf 100644 --- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj +++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj @@ -4,6 +4,7 @@ net5.0 Library latest + Umbraco.Cms.Web.BackOffice diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs index 2ff8141b07..0f4ccd09fb 100644 --- a/src/Umbraco.Web.UI.NetCore/Startup.cs +++ b/src/Umbraco.Web.UI.NetCore/Startup.cs @@ -6,8 +6,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Extensions; -using Umbraco.Web.BackOffice.DependencyInjection; -using Umbraco.Web.BackOffice.Security; using Umbraco.Web.Common.DependencyInjection; using Umbraco.Web.Website.DependencyInjection; diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml index a8f3ebea41..922d30654c 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml @@ -4,12 +4,10 @@ @using Umbraco.Cms.Core.Configuration.Models @using Umbraco.Cms.Core.Hosting @using Umbraco.Cms.Core.WebAssets -@using Umbraco.Core +@using Umbraco.Cms.Web.BackOffice.Controllers +@using Umbraco.Cms.Web.BackOffice.Security @using Umbraco.Web.WebAssets -@using Umbraco.Web.BackOffice.Security -@using Umbraco.Core.Configuration @using Umbraco.Extensions -@using Umbraco.Web.BackOffice.Controllers @inject BackOfficeServerVariables backOfficeServerVariables @inject IUmbracoVersion umbracoVersion @inject IHostingEnvironment hostingEnvironment diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml index a2f3f7da71..d488e5295c 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml @@ -7,14 +7,10 @@ @using Umbraco.Cms.Core.Logging @using Umbraco.Cms.Core.Services @using Umbraco.Cms.Core.WebAssets -@using Umbraco.Core +@using Umbraco.Cms.Web.BackOffice.Controllers +@using Umbraco.Cms.Web.BackOffice.Security @using Umbraco.Web.WebAssets -@using Umbraco.Web.BackOffice.Security -@using Umbraco.Core.Configuration @using Umbraco.Extensions -@using Umbraco.Core.Logging -@using Umbraco.Core.Services -@using Umbraco.Web.BackOffice.Controllers @inject BackOfficeServerVariables backOfficeServerVariables @inject IUmbracoVersion umbracoVersion @inject IHostingEnvironment hostingEnvironment diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml index 4d46d86998..5cf653a5d9 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml @@ -5,12 +5,11 @@ @using Umbraco.Cms.Core.Logging @using Umbraco.Cms.Core.Services @using Umbraco.Cms.Core.WebAssets +@using Umbraco.Cms.Web.BackOffice.Controllers +@using Umbraco.Cms.Web.BackOffice.Security @using Umbraco.Web.WebAssets @using Umbraco.Web.Common.Security -@using Umbraco.Core.Configuration @using Umbraco.Extensions -@using Umbraco.Core.Logging -@using Umbraco.Web.BackOffice.Controllers @inject IBackOfficeSignInManager SignInManager @inject BackOfficeServerVariables BackOfficeServerVariables @inject IUmbracoVersion UmbracoVersion @@ -19,7 +18,6 @@ @inject IRuntimeMinifier RuntimeMinifier @inject IProfilerHtml ProfilerHtml @inject ILocalizedTextService LocalizedTextService -@using Umbraco.Core.Services @model Umbraco.Cms.Core.Editors.BackOfficePreviewModel @{