diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs index ca476a3538..8e7a4b989c 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs @@ -7,8 +7,8 @@ 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.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.Authorization; namespace Umbraco.Cms.ModelsBuilder.Embedded.BackOffice { diff --git a/src/Umbraco.ModelsBuilder.Embedded/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.ModelsBuilder.Embedded/DependencyInjection/UmbracoBuilderExtensions.cs index 65ff9d9843..5209683e8e 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/DependencyInjection/UmbracoBuilderExtensions.cs @@ -9,7 +9,7 @@ using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.ModelsBuilder.Embedded; using Umbraco.Cms.ModelsBuilder.Embedded.Building; -using Umbraco.Web.Common.ModelBinders; +using Umbraco.Cms.Web.Common.ModelBinders; using Umbraco.Web.WebAssets; /* diff --git a/src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs b/src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs index 9c325cc0b7..a8b9ac3b14 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs @@ -11,9 +11,9 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.ModelsBuilder.Embedded.BackOffice; +using Umbraco.Cms.Web.Common.ModelBinders; using Umbraco.Core.Services.Implement; using Umbraco.Extensions; -using Umbraco.Web.Common.ModelBinders; using Umbraco.Web.WebAssets; namespace Umbraco.Cms.ModelsBuilder.Embedded diff --git a/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs b/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs index 03dbcca14d..915cd28645 100644 --- a/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs +++ b/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs @@ -19,7 +19,6 @@ using Umbraco.Tests.Integration.Extensions; using Umbraco.Tests.Integration.Implementations; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; -using Umbraco.Web.Common.DependencyInjection; namespace Umbraco.Tests.Integration { diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs index 53752f6ece..9784084bc4 100644 --- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs +++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs @@ -29,10 +29,10 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Net; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Runtime; +using Umbraco.Cms.Web.Common.AspNetCore; using Umbraco.Core.Persistence; using Umbraco.Extensions; using Umbraco.Tests.Common; -using Umbraco.Web.Common.AspNetCore; using File = System.IO.File; using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs b/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs index ffc0c84f96..aad95eb792 100644 --- a/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs +++ b/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; -using Umbraco.Web.Common.AspNetCore; +using Umbraco.Cms.Web.Common.AspNetCore; using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; namespace Umbraco.Tests.Integration.Implementations diff --git a/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs b/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs index 83618301ed..256f5bc464 100644 --- a/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs +++ b/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs @@ -14,7 +14,6 @@ using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Core; using Umbraco.Core.Security; using Umbraco.Core.Services; -using Umbraco.Web.Common.Security; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.Integration.TestServerTest diff --git a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs index c5baa0bfd9..6d5dd84798 100644 --- a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs +++ b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs @@ -20,12 +20,11 @@ using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.Common.Controllers; using Umbraco.Extensions; using Umbraco.Tests.Integration.DependencyInjection; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; -using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.DependencyInjection; using Umbraco.Web.Website.Controllers; using Umbraco.Web.Website.DependencyInjection; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs index bbce6e084f..f389b4fa8a 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.Common.DependencyInjection; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.Integration.Testing 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 dbdda6d841..15b868115c 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs @@ -11,11 +11,11 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.Common.Formatters; using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; using Umbraco.Tests.Integration.TestServerTest; -using Umbraco.Web.Common.Formatters; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.Integration.Umbraco.Web.BackOffice.Controllers 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 36e0e519fb..6fd151995a 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs @@ -9,10 +9,10 @@ using Newtonsoft.Json.Linq; using NUnit.Framework; using Umbraco.Cms.Core.Models.TemplateQuery; using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.Common.Formatters; using Umbraco.Extensions; using Umbraco.Tests.Common.Builders.Extensions; using Umbraco.Tests.Integration.TestServerTest; -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 49623c31c4..7f071ca3c7 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs @@ -17,11 +17,11 @@ 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.Cms.Web.Common.Formatters; using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; using Umbraco.Tests.Integration.TestServerTest; -using Umbraco.Web.Common.Formatters; namespace Umbraco.Tests.Integration.Umbraco.Web.BackOffice.Controllers { diff --git a/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs b/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs index 4acd15b01e..44060e69cb 100644 --- a/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs +++ b/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs @@ -17,11 +17,11 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Cms.Web.BackOffice.Routing; +using Umbraco.Cms.Web.Common.Install; +using Umbraco.Cms.Web.Common.Security; using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.Security; -using Umbraco.Web.Common.Install; -using Umbraco.Web.Common.Security; namespace Umbraco.Tests.UnitTests.AutoFixture { diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs b/src/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs index dbb28ec5db..875f668ee8 100644 --- a/src/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs +++ b/src/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs @@ -10,11 +10,12 @@ using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.Common.AspNetCore; +using Umbraco.Cms.Web.Common.UmbracoContext; using Umbraco.Core.Security; using Umbraco.Tests.Common; using Umbraco.Tests.TestHelpers; using Umbraco.Web; -using Umbraco.Web.Common.AspNetCore; using Umbraco.Web.PublishedCache; using Umbraco.Web.Routing; diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs index 16c67d86d1..46792c4af9 100644 --- a/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs +++ b/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs @@ -32,13 +32,13 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Web.Common.AspNetCore; using Umbraco.Core; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Extensions; using Umbraco.Infrastructure.Persistence.Mappers; using Umbraco.Tests.Common; -using Umbraco.Web.Common.AspNetCore; using Constants = Umbraco.Cms.Core.Constants; using File = System.IO.File; using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs index 11561b9223..fe8049c799 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs @@ -15,6 +15,7 @@ using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.Common.UmbracoContext; using Umbraco.Core.PropertyEditors; using Umbraco.Extensions; using Umbraco.Tests.TestHelpers; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs index 69ab4a1cfa..964f67d0c4 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs @@ -5,9 +5,9 @@ using AutoFixture.NUnit3; using Microsoft.Extensions.Options; using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; +using Umbraco.Cms.Web.Common.AspNetCore; using Umbraco.Extensions; using Umbraco.Tests.UnitTests.AutoFixture; -using Umbraco.Web.Common.AspNetCore; namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs index 63c39a68e4..7f7037cbc5 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs @@ -7,8 +7,8 @@ using Microsoft.Extensions.Options; using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; +using Umbraco.Cms.Web.Common.AspNetCore; using Umbraco.Extensions; -using Umbraco.Web.Common.AspNetCore; namespace Umbraco.Tests.UnitTests.Umbraco.Core.Extensions { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs index 6fcae38883..2d3e7f2546 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs @@ -5,7 +5,7 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Routing; -using Umbraco.Web.Common.AspNetCore; +using Umbraco.Cms.Web.Common.AspNetCore; using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; namespace Umbraco.Tests.UnitTests.Umbraco.Core.Routing 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 0da7a0def5..e93803043b 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs @@ -20,7 +20,6 @@ using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; -using Umbraco.Web.BackOffice.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization 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 0375bc7a28..794b5b5ac4 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs @@ -15,7 +15,6 @@ using Umbraco.Core; using Umbraco.Core.Security; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; -using Umbraco.Web.BackOffice.Authorization; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { 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 e5393db851..b307700547 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs @@ -20,7 +20,6 @@ using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Tests.Common.Builders; -using Umbraco.Web.BackOffice.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization 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 2aead52901..1d54d1b655 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs @@ -21,7 +21,6 @@ using Umbraco.Core.Models; using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Tests.Common.Builders; -using Umbraco.Web.BackOffice.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization 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 30742e7c11..f40321ee5a 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs @@ -17,7 +17,6 @@ using Umbraco.Core.Models; using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Tests.Common.Builders; -using Umbraco.Web.BackOffice.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization 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 a98acef088..1ba49ebd07 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs @@ -9,7 +9,6 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Cms.Web.BackOffice.Security; -using Umbraco.Web.BackOffice.Authorization; 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 05b594f154..da46faf96d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs @@ -21,7 +21,6 @@ using Umbraco.Core.Models; using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Tests.Common.Builders; -using Umbraco.Web.BackOffice.Authorization; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { 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 7fd5c0c836..63380b15e8 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs @@ -16,7 +16,6 @@ using Umbraco.Core.Models; using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Tests.Common.Builders; -using Umbraco.Web.BackOffice.Authorization; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { 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 f4edcc1d8e..7a9bf1eaf6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs @@ -13,7 +13,6 @@ using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Core; using Umbraco.Core.Security; using Umbraco.Tests.Common.Builders; -using Umbraco.Web.BackOffice.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization 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 91672c2c47..16046505c6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs @@ -16,7 +16,6 @@ using Umbraco.Core; using Umbraco.Core.Security; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; -using Umbraco.Web.BackOffice.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization 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 a152247658..79ecc95608 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs @@ -18,7 +18,6 @@ using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; -using Umbraco.Web.BackOffice.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization 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 ba88d61edf..26431b572e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs @@ -12,10 +12,8 @@ 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 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 8492a575aa..de34b245bb 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs @@ -14,8 +14,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.Common.Install; using Umbraco.Tests.UnitTests.AutoFixture; -using Umbraco.Web.Common.Install; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs index 03bab2e02b..3e9c5db175 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.DataProtection; using NUnit.Framework; -using Umbraco.Web.Common.Exceptions; -using Umbraco.Web.Common.Filters; -using Umbraco.Web.Common.Security; +using Umbraco.Cms.Web.Common.Exceptions; +using Umbraco.Cms.Web.Common.Filters; +using Umbraco.Cms.Web.Common.Security; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Filters { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs index ab087b325a..de13be5628 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs @@ -4,7 +4,7 @@ using System.Runtime.Serialization; using Newtonsoft.Json; using NUnit.Framework; -using Umbraco.Web.Common.Formatters; +using Umbraco.Cms.Web.Common.Formatters; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Formatters { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs index 07faa3d402..e993cbbc17 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs @@ -10,11 +10,8 @@ using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Models; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors.ValueConverters; using Umbraco.Extensions; -using Umbraco.Web.Models; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs index 8e5ba46a8b..5de12b33ef 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Macros; +using Umbraco.Cms.Web.Common.Macros; using Umbraco.Core.Cache; using Umbraco.Web.Macros; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs index 91eee9fac8..97e9f7a5b3 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs @@ -15,11 +15,11 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.Common.ModelBinders; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Core; using Umbraco.Core.Events; using Umbraco.Core.Services; -using Umbraco.Web.Common.ModelBinders; -using Umbraco.Web.Common.Routing; using Umbraco.Web.Models; using Umbraco.Web.Routing; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs index 6e06adf727..c4fe1a3d2e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Primitives; using NUnit.Framework; -using Umbraco.Web.Common.ModelBinders; +using Umbraco.Cms.Web.Common.ModelBinders; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.ModelBinders { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs index b106d24ed6..c91409e96f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs @@ -2,7 +2,7 @@ // See LICENSE for more details. using NUnit.Framework; -using Umbraco.Web.Common.Mvc; +using Umbraco.Cms.Web.Common.Mvc; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Mvc { 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 6a367f6da2..b5cbe6be8c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs @@ -13,10 +13,9 @@ 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.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Controllers; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Controllers; using Constants = Umbraco.Cms.Core.Constants; using static Umbraco.Cms.Core.Constants.Web.Routing; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs index ecdd0dc436..cb45691338 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs @@ -9,9 +9,8 @@ using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; -using Umbraco.Core; +using Umbraco.Cms.Web.Common.Install; using Umbraco.Extensions; -using Umbraco.Web.Common.Install; using static Umbraco.Cms.Core.Constants.Web.Routing; 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 d2b9d5f182..f1daab3921 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs @@ -13,7 +13,6 @@ 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 Constants = Umbraco.Cms.Core.Constants; using static Umbraco.Cms.Core.Constants.Web.Routing; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs index 4157e360e1..378cad7dd2 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs @@ -8,7 +8,7 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; -using Umbraco.Web.Common.Routing; +using Umbraco.Cms.Web.Common.Routing; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Routing { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs index 0e54676f10..e1688fb11d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.DataProtection; using NUnit.Framework; -using Umbraco.Web.Common.Security; +using Umbraco.Cms.Web.Common.Security; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Security { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs index 3fc4380eb2..47a7b37a9c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs @@ -11,9 +11,9 @@ using NUnit.Framework; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Cms.Web.Common.AspNetCore; +using Umbraco.Cms.Web.Common.ModelBinders; using Umbraco.Core.Events; -using Umbraco.Web.Common.AspNetCore; -using Umbraco.Web.Common.ModelBinders; using Umbraco.Web.Models; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Views diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs index c999d5fe1d..53b1b8bb2e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs @@ -4,8 +4,8 @@ using System; using NUnit.Framework; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Web.Common.AspNetCore; using Umbraco.Tests.UnitTests.AutoFixture; -using Umbraco.Web.Common.AspNetCore; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs index 97fce92b2f..9bda656a4c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs @@ -18,6 +18,7 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Core.Cache; using Umbraco.Core.Security; using Umbraco.Core.Services; @@ -25,7 +26,6 @@ using Umbraco.Tests.Common; using Umbraco.Tests.Testing; using Umbraco.Tests.UnitTests.TestHelpers.Objects; using Umbraco.Web; -using Umbraco.Web.Common.Routing; using Umbraco.Web.PublishedCache; using Umbraco.Web.Routing; using Umbraco.Web.Website.Controllers; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs index aa52236a6a..ae8b450dc9 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs @@ -3,23 +3,17 @@ using System.Linq; using System.Reflection; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Routing; -using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.Extensions.Primitives; using Moq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Web; -using Umbraco.Core; +using Umbraco.Cms.Web.Common.Controllers; using Umbraco.Extensions; -using Umbraco.Web; -using Umbraco.Web.Common.Controllers; using Umbraco.Web.Website.Routing; using static Umbraco.Cms.Core.Constants.Web.Routing; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs index 84b56c4f56..2cf6035ad8 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs @@ -17,14 +17,10 @@ using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; -using Umbraco.Core; +using Umbraco.Cms.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Extensions; using Umbraco.Tests.TestHelpers; -using Umbraco.Web; -using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.Routing; -using Umbraco.Web.PublishedCache; -using Umbraco.Web.Routing; using Umbraco.Web.Website.Controllers; using Umbraco.Web.Website.Routing; using static Umbraco.Cms.Core.Constants.Web.Routing; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs index 7dbee3222d..35e8559367 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs @@ -14,13 +14,9 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Cms.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Extensions; -using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.Routing; -using Umbraco.Web.Routing; using Umbraco.Web.Website.Controllers; using Umbraco.Web.Website.Routing; diff --git a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs index f8060826c7..f8e134957a 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs @@ -25,13 +25,13 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Extensions; using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Cms.Web.BackOffice.Security; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Filters; using Umbraco.Core.Security; using Umbraco.Extensions; -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 Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsController.cs index da073325e1..8215e8fead 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsController.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; -using Umbraco.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs index fa01c7cfed..146b4ff532 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs @@ -25,13 +25,13 @@ using Umbraco.Cms.Core.WebAssets; using Umbraco.Cms.Web.BackOffice.ActionResults; using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Cms.Web.BackOffice.Security; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Filters; using Umbraco.Core.Security; using Umbraco.Extensions; -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.WebAssets; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs index 6f98586d72..5d874a9ce3 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs @@ -22,9 +22,9 @@ 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.Cms.Web.Common.Attributes; using Umbraco.Core; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs b/src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs index 430ff45e51..25f8f21c01 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs @@ -19,10 +19,10 @@ using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Strings.Css; using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Cms.Web.BackOffice.Trees; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.ActionsResults; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; using Stylesheet = Umbraco.Cms.Core.Models.Stylesheet; using StylesheetRule = Umbraco.Cms.Core.Models.ContentEditing.StylesheetRule; diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs index 57f8029a40..ee7cf589e5 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs @@ -31,11 +31,11 @@ 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.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Core.Persistence; 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.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs index ab692f69c9..b6c8a4a2b9 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs @@ -11,8 +11,8 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Web.Common.Filters; using Umbraco.Extensions; -using Umbraco.Web.Common.Filters; namespace Umbraco.Cms.Web.BackOffice.Controllers { diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs index 25e8dcfe4c..e32cb46b57 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs @@ -21,11 +21,11 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Core.Packaging; using Umbraco.Extensions; -using Umbraco.Web.Common.ActionsResults; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; using ContentType = Umbraco.Cms.Core.Models.ContentType; diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs index a933776a16..b26db7f8fc 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs @@ -15,9 +15,9 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Extensions; using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Extensions; -using Umbraco.Web.Common.ActionsResults; -using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs b/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs index 345b6880d9..cce6adf112 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs @@ -23,11 +23,11 @@ using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Web.BackOffice.Extensions; using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Cms.Web.BackOffice.Security; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Core.Security; 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.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs b/src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs index 406b3b66f3..42c37684a3 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs @@ -16,11 +16,11 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Filters; using Umbraco.Extensions; -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.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs index f95068d259..3d532c4d94 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs @@ -18,10 +18,10 @@ using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Extensions; using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; 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.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs b/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs index 62330d12eb..2d49c97f2a 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs @@ -14,10 +14,10 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Extensions; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; 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.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/ElementTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/ElementTypeController.cs index 4b32f020a4..f15010387d 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ElementTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ElementTypeController.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; namespace Umbraco.Cms.Web.BackOffice.Controllers { diff --git a/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs b/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs index f9642dbaa0..a561b36094 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs @@ -19,11 +19,11 @@ using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Trees; using Umbraco.Cms.Core.Xml; using Umbraco.Cms.Web.BackOffice.ModelBinders; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.ModelBinders; using Umbraco.Core.Persistence; using Umbraco.Extensions; using Umbraco.Web; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.ModelBinders; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs b/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs index 1e4d9a55a8..e863293ed4 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs @@ -7,9 +7,9 @@ using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models.ContentEditing; +using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Examine; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; using SearchResult = Umbraco.Cms.Core.Models.ContentEditing.SearchResult; diff --git a/src/Umbraco.Web.BackOffice/Controllers/HelpController.cs b/src/Umbraco.Web.BackOffice/Controllers/HelpController.cs index 4bc69502e3..3bc45703fa 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/HelpController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/HelpController.cs @@ -4,7 +4,7 @@ using System.Runtime.Serialization; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Newtonsoft.Json; -using Umbraco.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/IconController.cs b/src/Umbraco.Web.BackOffice/Controllers/IconController.cs index 46e62a4f07..93024941c1 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/IconController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/IconController.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; -using Umbraco.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Attributes; namespace Umbraco.Cms.Web.BackOffice.Controllers { diff --git a/src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs b/src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs index bfe05afec2..1d72c80ad8 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Models; -using Umbraco.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs b/src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs index 7b3dd04945..8b9ab5652c 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs @@ -4,8 +4,8 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Models; +using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/KeepAliveController.cs b/src/Umbraco.Web.BackOffice/Controllers/KeepAliveController.cs index 8b039cd93b..650efec70f 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/KeepAliveController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/KeepAliveController.cs @@ -1,8 +1,8 @@ using System.Runtime.Serialization; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Web.BackOffice.Filters; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Controllers; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs b/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs index 5ac98c8a3c..b1090c9b8e 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs @@ -10,10 +10,10 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Extensions; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.ActionsResults; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; using Language = Umbraco.Cms.Core.Models.ContentEditing.Language; diff --git a/src/Umbraco.Web.BackOffice/Controllers/LogController.cs b/src/Umbraco.Web.BackOffice/Controllers/LogController.cs index cd46b7531e..b6ef9ef3cf 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/LogController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/LogController.cs @@ -11,9 +11,9 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Core.Persistence; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs b/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs index b46a1e8e0f..d3fd41d663 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs @@ -4,10 +4,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Core.Logging.Viewer; -using Umbraco.Web.Common.ActionsResults; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs b/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs index bce7c48601..460bd4a8a8 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs @@ -14,8 +14,8 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Templates; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs b/src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs index ed670847b6..8a1df92c00 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs @@ -15,10 +15,10 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; 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.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/MediaController.cs b/src/Umbraco.Web.BackOffice/Controllers/MediaController.cs index 5733b23c30..17ea52fc97 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MediaController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MediaController.cs @@ -35,11 +35,11 @@ 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.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Core.Persistence; 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.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs index b9a14dc498..36591316d5 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs @@ -12,10 +12,10 @@ 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.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; 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.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs b/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs index a0b31c8f44..441ed1c5c3 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs @@ -27,12 +27,12 @@ using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Web.BackOffice.Extensions; using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Cms.Web.BackOffice.ModelBinders; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Filters; using Umbraco.Core.Services.Implement; using Umbraco.Extensions; -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.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs b/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs index 3285342423..7146cd5820 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs @@ -8,9 +8,9 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs index d2227001d3..57cb18250c 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs @@ -12,9 +12,9 @@ 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.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs b/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs index a017313776..99dcf161ab 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs @@ -14,10 +14,10 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Semver; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Extensions; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; 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.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs b/src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs index 809bc070d7..0da770c0c5 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs @@ -17,10 +17,10 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Semver; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.WebAssets; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; 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.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs b/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs index 9b2c353ff6..749b2a0bfb 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs @@ -17,9 +17,9 @@ using Umbraco.Cms.Core.Web; using Umbraco.Cms.Core.WebAssets; using Umbraco.Cms.Web.BackOffice.ActionResults; using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Filters; using Umbraco.Extensions; -using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Common.Filters; using Umbraco.Web.WebAssets; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs b/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs index 6110a5f3e2..96fff53dbb 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs @@ -3,8 +3,8 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.PublishedCache; +using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Web.Cache; -using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs b/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs index 7865c4ca8d..089f4e6b65 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs @@ -15,8 +15,8 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs b/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs index afe0dd0102..882b26e4e4 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs @@ -6,9 +6,9 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs index bd653dd580..e979d02794 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs @@ -11,10 +11,10 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; 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.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/SectionController.cs b/src/Umbraco.Web.BackOffice/Controllers/SectionController.cs index 6d610c9d94..00874c9a74 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/SectionController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/SectionController.cs @@ -12,8 +12,8 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Trees; +using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; using Umbraco.Web.Models.Trees; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs b/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs index a1884a6595..0eb18cf7cd 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs @@ -2,8 +2,8 @@ using System.Linq; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs b/src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs index d3822ad6a8..91395431e9 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs @@ -10,8 +10,8 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs b/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs index 11638160e6..efbbb2cd9d 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs @@ -7,9 +7,9 @@ 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.Cms.Web.Common.Attributes; using Umbraco.Extensions; using Umbraco.Web; -using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs b/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs index eb930e3862..c1d2cecc2d 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs @@ -13,10 +13,10 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; 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.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/TourController.cs b/src/Umbraco.Web.BackOffice/Controllers/TourController.cs index b3926a7d0c..b77ff2a2cc 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/TourController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/TourController.cs @@ -10,7 +10,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Tour; -using Umbraco.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedApiController.cs b/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedApiController.cs index 376e4b6b96..3891550f1e 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedApiController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedApiController.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; 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; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Filters; namespace Umbraco.Cms.Web.BackOffice.Controllers { diff --git a/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedJsonController.cs b/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedJsonController.cs index 158c63c063..eb082ae6e6 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedJsonController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedJsonController.cs @@ -1,5 +1,5 @@ using Umbraco.Cms.Web.BackOffice.Filters; -using Umbraco.Web.Common.Filters; +using Umbraco.Cms.Web.Common.Filters; namespace Umbraco.Cms.Web.BackOffice.Controllers { diff --git a/src/Umbraco.Web.BackOffice/Controllers/UpdateCheckController.cs b/src/Umbraco.Web.BackOffice/Controllers/UpdateCheckController.cs index 4edc9a7fd3..2f1f887ba6 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/UpdateCheckController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/UpdateCheckController.cs @@ -11,8 +11,8 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Semver; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/UserGroupsController.cs b/src/Umbraco.Web.BackOffice/Controllers/UserGroupsController.cs index babff8513a..e7f90bf521 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/UserGroupsController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/UserGroupsController.cs @@ -11,9 +11,9 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Web.BackOffice.ActionResults; using Umbraco.Cms.Web.BackOffice.Filters; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs b/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs index 58e115e72c..817733fe1a 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs @@ -34,13 +34,13 @@ 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.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Core; using Umbraco.Core.Persistence; using Umbraco.Core.Security; 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.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs index 70fabbe27e..574af724c7 100644 --- a/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs +++ b/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs @@ -8,10 +8,10 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Cms.Web.BackOffice.Security; +using Umbraco.Cms.Web.Common.AspNetCore; +using Umbraco.Cms.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Security; using Umbraco.Core.Security; -using Umbraco.Web.Common.AspNetCore; -using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Common.Security; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Extensions diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs index 05a20b55d3..4baf6a29f5 100644 --- a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs @@ -15,10 +15,8 @@ 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.Cms.Web.Common.Authorization; using Umbraco.Infrastructure.DependencyInjection; -using Umbraco.Web.BackOffice.Authorization; -using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Common.DependencyInjection; using Umbraco.Web.WebAssets; namespace Umbraco.Extensions diff --git a/src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs index 3214162e62..d63deda88a 100644 --- a/src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs +++ b/src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs @@ -4,7 +4,6 @@ using Microsoft.Extensions.DependencyInjection; 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/Filters/ContentSaveValidationAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs index 9fdc8f75f5..beadb10fc7 100644 --- a/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs @@ -11,7 +11,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Authorization; -using Umbraco.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Filters diff --git a/src/Umbraco.Web.BackOffice/Filters/DataTypeValidateAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/DataTypeValidateAttribute.cs index ccceff1805..24c15e8a7f 100644 --- a/src/Umbraco.Web.BackOffice/Filters/DataTypeValidateAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/DataTypeValidateAttribute.cs @@ -9,8 +9,8 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Extensions; +using Umbraco.Cms.Web.Common.ActionsResults; using Umbraco.Extensions; -using Umbraco.Web.Common.ActionsResults; namespace Umbraco.Cms.Web.BackOffice.Filters { diff --git a/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs index f6c70f328c..c8b7683a2c 100644 --- a/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Options; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using Umbraco.Web.Common.Formatters; +using Umbraco.Cms.Web.Common.Formatters; namespace Umbraco.Cms.Web.BackOffice.Filters { diff --git a/src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs index facdf26ce1..ff5f8a83c1 100644 --- a/src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Authorization; -using Umbraco.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Filters diff --git a/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs index 316496b58e..1bcfbfe0f9 100644 --- a/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs @@ -7,8 +7,8 @@ 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.Cms.Web.Common.ActionsResults; using Umbraco.Extensions; -using Umbraco.Web.Common.ActionsResults; namespace Umbraco.Cms.Web.BackOffice.Filters { diff --git a/src/Umbraco.Web.BackOffice/HealthChecks/HealthCheckController.cs b/src/Umbraco.Web.BackOffice/HealthChecks/HealthCheckController.cs index 65682f24db..82029eb8c5 100644 --- a/src/Umbraco.Web.BackOffice/HealthChecks/HealthCheckController.cs +++ b/src/Umbraco.Web.BackOffice/HealthChecks/HealthCheckController.cs @@ -12,8 +12,8 @@ using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.HealthChecks; using Umbraco.Cms.Web.BackOffice.Controllers; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.HealthChecks diff --git a/src/Umbraco.Web.BackOffice/Mapping/CommonTreeNodeMapper.cs b/src/Umbraco.Web.BackOffice/Mapping/CommonTreeNodeMapper.cs index 4f4296bbe5..9559275ec9 100644 --- a/src/Umbraco.Web.BackOffice/Mapping/CommonTreeNodeMapper.cs +++ b/src/Umbraco.Web.BackOffice/Mapping/CommonTreeNodeMapper.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Routing; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Web.BackOffice.Trees; +using Umbraco.Cms.Web.Common.Controllers; using Umbraco.Extensions; -using Umbraco.Web.Common.Controllers; namespace Umbraco.Cms.Web.BackOffice.Mapping { diff --git a/src/Umbraco.Web.BackOffice/Profiling/WebProfilingController.cs b/src/Umbraco.Web.BackOffice/Profiling/WebProfilingController.cs index 8cb456256e..211c5261e4 100644 --- a/src/Umbraco.Web.BackOffice/Profiling/WebProfilingController.cs +++ b/src/Umbraco.Web.BackOffice/Profiling/WebProfilingController.cs @@ -1,8 +1,8 @@ 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 Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Profiling diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs index 40172e258c..25d120d807 100644 --- a/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs +++ b/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs @@ -6,8 +6,8 @@ using System.Linq; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.PropertyEditors diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/RichTextPreValueController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/RichTextPreValueController.cs index 734bb5ad77..faa4cc83dc 100644 --- a/src/Umbraco.Web.BackOffice/PropertyEditors/RichTextPreValueController.cs +++ b/src/Umbraco.Web.BackOffice/PropertyEditors/RichTextPreValueController.cs @@ -5,8 +5,8 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.PropertyEditors diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs index 5e64d4f56e..08a35b6c6d 100644 --- a/src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs +++ b/src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Media.EmbedProviders; using Umbraco.Cms.Web.BackOffice.Controllers; -using Umbraco.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.PropertyEditors diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs index 7d686690e6..17d015abc8 100644 --- a/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs +++ b/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs @@ -4,8 +4,8 @@ using System.Linq; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.PropertyEditors diff --git a/src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs b/src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs index ce5b2e0880..2a83b45fd5 100644 --- a/src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs +++ b/src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs @@ -7,9 +7,9 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web.Mvc; using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Extensions; -using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.Routing; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Routing diff --git a/src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs b/src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs index fc80299149..a207a727fb 100644 --- a/src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs +++ b/src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs @@ -7,8 +7,8 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Cms.Web.BackOffice.SignalR; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Extensions; -using Umbraco.Web.Common.Routing; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Routing diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs index 9f1c53df2c..ea8a0dcfc9 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs @@ -9,9 +9,9 @@ using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; +using Umbraco.Cms.Web.Common.Security; using Umbraco.Core.Security; using Umbraco.Extensions; -using Umbraco.Web.Common.Security; namespace Umbraco.Cms.Web.BackOffice.Security { diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs index e287efe56b..a90a3a4466 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs @@ -4,10 +4,10 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.Common.Security; using Umbraco.Core.Compose; using Umbraco.Core.Security; using Umbraco.Extensions; -using Umbraco.Web.Common.Security; namespace Umbraco.Cms.Web.BackOffice.Security { diff --git a/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs index 3add8bfadc..3877f9a0e2 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs @@ -12,10 +12,10 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Cms.Web.BackOffice.Extensions; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Filters; +using Umbraco.Cms.Web.Common.ModelBinders; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Filters; -using Umbraco.Web.Common.ModelBinders; using Umbraco.Web.Models.Trees; using static Umbraco.Cms.Core.Constants.Web.Routing; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs index b33d436c02..4b48902e17 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs @@ -10,9 +10,9 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs index 82b93e5d6b..63326a8c7a 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs @@ -16,10 +16,10 @@ using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Core; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs index 1ac4cecae1..7bb9782c5e 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs @@ -13,8 +13,8 @@ using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Cms.Web.Common.ModelBinders; using Umbraco.Extensions; -using Umbraco.Web.Common.ModelBinders; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs index 16da4f9857..2151141406 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs @@ -11,9 +11,9 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs index c108456f1b..714fb6954c 100644 --- a/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs @@ -11,9 +11,9 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs index d6a1b4d14a..3355cc5312 100644 --- a/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs @@ -9,9 +9,9 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/ITreeNodeController.cs b/src/Umbraco.Web.BackOffice/Trees/ITreeNodeController.cs index 45436e2ebd..409d92558c 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ITreeNodeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ITreeNodeController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Trees; -using Umbraco.Web.Common.ModelBinders; +using Umbraco.Cms.Web.Common.ModelBinders; namespace Umbraco.Cms.Web.BackOffice.Trees { diff --git a/src/Umbraco.Web.BackOffice/Trees/LanguageTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/LanguageTreeController.cs index 3655c9e963..a3e55a68dc 100644 --- a/src/Umbraco.Web.BackOffice/Trees/LanguageTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/LanguageTreeController.cs @@ -4,8 +4,8 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/LogViewerTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/LogViewerTreeController.cs index a850706754..7a9eec99fe 100644 --- a/src/Umbraco.Web.BackOffice/Trees/LogViewerTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/LogViewerTreeController.cs @@ -4,8 +4,8 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/MacrosTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MacrosTreeController.cs index 63773a3b4b..8f587bd9a4 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MacrosTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MacrosTreeController.cs @@ -7,8 +7,8 @@ using Umbraco.Cms.Core.Actions; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs index c9cbc1fd21..74c6ef39d2 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs @@ -14,9 +14,9 @@ using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs index 6ef8a8a7b9..8b1a6c70a1 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs @@ -11,9 +11,9 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Trees/MemberGroupTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MemberGroupTreeController.cs index 1c483e9cb2..10379c7991 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MemberGroupTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MemberGroupTreeController.cs @@ -6,8 +6,8 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs index 7b465d77a5..5d72327525 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs @@ -12,10 +12,10 @@ using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.ModelBinders; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Common.ModelBinders; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Trees/MemberTypeAndGroupTreeControllerBase.cs b/src/Umbraco.Web.BackOffice/Trees/MemberTypeAndGroupTreeControllerBase.cs index 6ae1b040f1..35c4d04d9f 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MemberTypeAndGroupTreeControllerBase.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MemberTypeAndGroupTreeControllerBase.cs @@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Actions; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/MemberTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MemberTypeTreeController.cs index a86a5427f8..731543a96c 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MemberTypeTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MemberTypeTreeController.cs @@ -8,8 +8,8 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Trees/PackagesTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/PackagesTreeController.cs index 864f5aafc1..4d53671388 100644 --- a/src/Umbraco.Web.BackOffice/Trees/PackagesTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/PackagesTreeController.cs @@ -4,8 +4,8 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/PartialViewMacrosTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/PartialViewMacrosTreeController.cs index 2e62302b96..9a31a286e7 100644 --- a/src/Umbraco.Web.BackOffice/Trees/PartialViewMacrosTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/PartialViewMacrosTreeController.cs @@ -3,8 +3,8 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/PartialViewsTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/PartialViewsTreeController.cs index 0e4aa41f0c..b9a592ca31 100644 --- a/src/Umbraco.Web.BackOffice/Trees/PartialViewsTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/PartialViewsTreeController.cs @@ -3,8 +3,8 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/RelationTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/RelationTypeTreeController.cs index a012d757c9..f786e68ae0 100644 --- a/src/Umbraco.Web.BackOffice/Trees/RelationTypeTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/RelationTypeTreeController.cs @@ -7,9 +7,9 @@ using Umbraco.Cms.Core.Actions; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs index f2333b7228..3b0b586e7d 100644 --- a/src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs @@ -12,9 +12,9 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeControllerBase.cs b/src/Umbraco.Web.BackOffice/Trees/TreeControllerBase.cs index 51db96d3ee..2e0d2b57b0 100644 --- a/src/Umbraco.Web.BackOffice/Trees/TreeControllerBase.cs +++ b/src/Umbraco.Web.BackOffice/Trees/TreeControllerBase.cs @@ -8,9 +8,9 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Trees; using Umbraco.Cms.Web.BackOffice.Controllers; +using Umbraco.Cms.Web.Common.Filters; +using Umbraco.Cms.Web.Common.ModelBinders; using Umbraco.Extensions; -using Umbraco.Web.Common.Filters; -using Umbraco.Web.Common.ModelBinders; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/UserTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/UserTreeController.cs index 23b811f295..6e06f7636d 100644 --- a/src/Umbraco.Web.BackOffice/Trees/UserTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/UserTreeController.cs @@ -4,8 +4,8 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.Common/ActionsResults/PublishedContentNotFoundResult.cs b/src/Umbraco.Web.Common/ActionsResults/PublishedContentNotFoundResult.cs index b43b0c6ee1..a2fb64f02d 100644 --- a/src/Umbraco.Web.Common/ActionsResults/PublishedContentNotFoundResult.cs +++ b/src/Umbraco.Web.Common/ActionsResults/PublishedContentNotFoundResult.cs @@ -4,9 +4,8 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Web; -using Umbraco.Web.Routing; -namespace Umbraco.Web.Common.ActionsResults +namespace Umbraco.Cms.Web.Common.ActionsResults { /// /// Returns the Umbraco not found result diff --git a/src/Umbraco.Web.Common/ActionsResults/UmbracoProblemResult.cs b/src/Umbraco.Web.Common/ActionsResults/UmbracoProblemResult.cs index 235ef0c037..e3279407fa 100644 --- a/src/Umbraco.Web.Common/ActionsResults/UmbracoProblemResult.cs +++ b/src/Umbraco.Web.Common/ActionsResults/UmbracoProblemResult.cs @@ -1,7 +1,7 @@ using System.Net; using Microsoft.AspNetCore.Mvc; -namespace Umbraco.Web.Common.ActionsResults +namespace Umbraco.Cms.Web.Common.ActionsResults { public class UmbracoProblemResult : ObjectResult { diff --git a/src/Umbraco.Web.Common/ActionsResults/ValidationErrorResult.cs b/src/Umbraco.Web.Common/ActionsResults/ValidationErrorResult.cs index 28e1abadb1..8fe0ef9326 100644 --- a/src/Umbraco.Web.Common/ActionsResults/ValidationErrorResult.cs +++ b/src/Umbraco.Web.Common/ActionsResults/ValidationErrorResult.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Extensions; -namespace Umbraco.Web.Common.ActionsResults +namespace Umbraco.Cms.Web.Common.ActionsResults { /// /// Custom result to return a validation error message with required headers diff --git a/src/Umbraco.Web.Common/ApplicationModels/BackOfficeApplicationModelProvider.cs b/src/Umbraco.Web.Common/ApplicationModels/BackOfficeApplicationModelProvider.cs index 11d82d4db5..7a14dee606 100644 --- a/src/Umbraco.Web.Common/ApplicationModels/BackOfficeApplicationModelProvider.cs +++ b/src/Umbraco.Web.Common/ApplicationModels/BackOfficeApplicationModelProvider.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Mvc.ApplicationModels; -using Microsoft.AspNetCore.Mvc.ModelBinding; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using Umbraco.Web.Common.Attributes; +using Microsoft.AspNetCore.Mvc.ApplicationModels; +using Microsoft.AspNetCore.Mvc.ModelBinding; +using Umbraco.Cms.Web.Common.Attributes; -namespace Umbraco.Web.Common.ApplicationModels +namespace Umbraco.Cms.Web.Common.ApplicationModels { // TODO: This should just exist in the back office project @@ -52,6 +52,6 @@ namespace Umbraco.Web.Common.ApplicationModels private bool IsBackOfficeController(ControllerModel controller) => controller.Attributes.OfType().Any(); - + } } diff --git a/src/Umbraco.Web.Common/ApplicationModels/BackOfficeIdentityCultureConvention.cs b/src/Umbraco.Web.Common/ApplicationModels/BackOfficeIdentityCultureConvention.cs index 0a5a1f9945..537ae58e89 100644 --- a/src/Umbraco.Web.Common/ApplicationModels/BackOfficeIdentityCultureConvention.cs +++ b/src/Umbraco.Web.Common/ApplicationModels/BackOfficeIdentityCultureConvention.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc.ApplicationModels; -using Umbraco.Web.Common.Filters; +using Umbraco.Cms.Web.Common.Filters; -namespace Umbraco.Web.Common.ApplicationModels +namespace Umbraco.Cms.Web.Common.ApplicationModels { // TODO: This should just exist in the back office project diff --git a/src/Umbraco.Web.Common/ApplicationModels/UmbracoApiBehaviorApplicationModelProvider.cs b/src/Umbraco.Web.Common/ApplicationModels/UmbracoApiBehaviorApplicationModelProvider.cs index be296969e7..118603ced9 100644 --- a/src/Umbraco.Web.Common/ApplicationModels/UmbracoApiBehaviorApplicationModelProvider.cs +++ b/src/Umbraco.Web.Common/ApplicationModels/UmbracoApiBehaviorApplicationModelProvider.cs @@ -1,12 +1,11 @@ -using Microsoft.AspNetCore.Mvc; +using System.Collections.Generic; +using System.Linq; +using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ApplicationModels; using Microsoft.AspNetCore.Mvc.ModelBinding; -using System.Collections.Generic; -using System.Linq; -using Umbraco.Core; -using Umbraco.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Attributes; -namespace Umbraco.Web.Common.ApplicationModels +namespace Umbraco.Cms.Web.Common.ApplicationModels { /// diff --git a/src/Umbraco.Web.Common/ApplicationModels/UmbracoJsonModelBinderConvention.cs b/src/Umbraco.Web.Common/ApplicationModels/UmbracoJsonModelBinderConvention.cs index 27f9bb84ca..e5f4f1c307 100644 --- a/src/Umbraco.Web.Common/ApplicationModels/UmbracoJsonModelBinderConvention.cs +++ b/src/Umbraco.Web.Common/ApplicationModels/UmbracoJsonModelBinderConvention.cs @@ -1,11 +1,9 @@ -using Microsoft.AspNetCore.Mvc.ApplicationModels; +using System.Linq; +using Microsoft.AspNetCore.Mvc.ApplicationModels; using Microsoft.AspNetCore.Mvc.ModelBinding; -using System.Linq; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Filters; -using Umbraco.Web.Common.ModelBinders; +using Umbraco.Cms.Web.Common.ModelBinders; -namespace Umbraco.Web.Common.ApplicationModels +namespace Umbraco.Cms.Web.Common.ApplicationModels { /// /// Applies the body model binder to any parameter binding source of type diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreApplicationShutdownRegistry.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreApplicationShutdownRegistry.cs index 706476b610..ff431966ce 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreApplicationShutdownRegistry.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreApplicationShutdownRegistry.cs @@ -4,9 +4,8 @@ using System.Threading; using Microsoft.Extensions.Hosting; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; -using Umbraco.Core; -namespace Umbraco.Web.Common.AspNetCore +namespace Umbraco.Cms.Web.Common.AspNetCore { public class AspNetCoreApplicationShutdownRegistry : IApplicationShutdownRegistry { diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreBackOfficeInfo.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreBackOfficeInfo.cs index 7058563a17..caaac9dfeb 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreBackOfficeInfo.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreBackOfficeInfo.cs @@ -1,9 +1,8 @@ using Microsoft.Extensions.Options; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; -using Umbraco.Core; -namespace Umbraco.Web.Common.AspNetCore +namespace Umbraco.Cms.Web.Common.AspNetCore { public class AspNetCoreBackOfficeInfo : IBackOfficeInfo { diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreCookieManager.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreCookieManager.cs index c4a5f60069..1ba86eac0c 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreCookieManager.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreCookieManager.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Http; using Umbraco.Cms.Core.Web; -namespace Umbraco.Web.Common.AspNetCore +namespace Umbraco.Cms.Web.Common.AspNetCore { public class AspNetCoreCookieManager : ICookieManager { diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs index 6e97249358..df7a75a791 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Extensions; using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; -namespace Umbraco.Web.Common.AspNetCore +namespace Umbraco.Cms.Web.Common.AspNetCore { public class AspNetCoreHostingEnvironment : IHostingEnvironment { diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreIpResolver.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreIpResolver.cs index bd7cdedadb..d7683e1ffe 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreIpResolver.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreIpResolver.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Http; using Umbraco.Cms.Core.Net; -namespace Umbraco.Web.Common.AspNetCore +namespace Umbraco.Cms.Web.Common.AspNetCore { public class AspNetCoreIpResolver : IIpResolver { diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreMarchal.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreMarchal.cs index 371e708852..bd9d4439e2 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreMarchal.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreMarchal.cs @@ -2,7 +2,7 @@ using System; using System.Runtime.InteropServices; using Umbraco.Cms.Core.Diagnostics; -namespace Umbraco.Web.Common.AspNetCore +namespace Umbraco.Cms.Web.Common.AspNetCore { public class AspNetCoreMarchal : IMarchal diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCorePasswordHasher.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCorePasswordHasher.cs index 54c31506e4..a68b27ec86 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCorePasswordHasher.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCorePasswordHasher.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore.Identity; -using IPasswordHasher = Umbraco.Cms.Core.Security.IPasswordHasher; -namespace Umbraco.Web.Common.AspNetCore +namespace Umbraco.Cms.Web.Common.AspNetCore { public class AspNetCorePasswordHasher : Cms.Core.Security.IPasswordHasher { diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs index 29c1172b6d..273213ecbb 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs @@ -7,11 +7,9 @@ using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Web; -using Umbraco.Core.Events; using Umbraco.Extensions; -using Umbraco.Web.Routing; -namespace Umbraco.Web.Common.AspNetCore +namespace Umbraco.Cms.Web.Common.AspNetCore { public class AspNetCoreRequestAccessor : IRequestAccessor, INotificationHandler { diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionManager.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionManager.cs index 80121ce409..9732d43e2d 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionManager.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionManager.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http.Features; using Umbraco.Cms.Core.Net; using Umbraco.Cms.Core.Web; -namespace Umbraco.Web.Common.AspNetCore +namespace Umbraco.Cms.Web.Common.AspNetCore { internal class AspNetCoreSessionManager : ISessionIdResolver, ISessionManager { diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs index e57e07542d..2bda7a28a7 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Hosting; using Umbraco.Cms.Core.Hosting; -namespace Umbraco.Web.Common.AspNetCore +namespace Umbraco.Cms.Web.Common.AspNetCore { public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime { diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUserAgentProvider.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUserAgentProvider.cs index d185105ffa..8e94fc3b80 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUserAgentProvider.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUserAgentProvider.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Http; using Umbraco.Cms.Core.Net; -namespace Umbraco.Web.Common.AspNetCore +namespace Umbraco.Cms.Web.Common.AspNetCore { public class AspNetCoreUserAgentProvider : IUserAgentProvider { diff --git a/src/Umbraco.Web.Common/AspNetCore/OptionsMonitorAdapter.cs b/src/Umbraco.Web.Common/AspNetCore/OptionsMonitorAdapter.cs index 9162c85cdd..5811bf45ec 100644 --- a/src/Umbraco.Web.Common/AspNetCore/OptionsMonitorAdapter.cs +++ b/src/Umbraco.Web.Common/AspNetCore/OptionsMonitorAdapter.cs @@ -1,7 +1,7 @@ using System; using Microsoft.Extensions.Options; -namespace Umbraco.Web.Common.AspNetCore +namespace Umbraco.Cms.Web.Common.AspNetCore { /// /// HACK: OptionsMonitor but without the monitoring, hopefully temporary. diff --git a/src/Umbraco.Web.Common/AspNetCore/UmbracoViewPage.cs b/src/Umbraco.Web.Common/AspNetCore/UmbracoViewPage.cs index eebf828b91..0d85d16a7e 100644 --- a/src/Umbraco.Web.Common/AspNetCore/UmbracoViewPage.cs +++ b/src/Umbraco.Web.Common/AspNetCore/UmbracoViewPage.cs @@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Logging; @@ -16,14 +15,10 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Logging; +using Umbraco.Cms.Web.Common.ModelBinders; using Umbraco.Extensions; -using Umbraco.Web.Common.ModelBinders; -using Umbraco.Web.Models; -using Umbraco.Web.Website; -namespace Umbraco.Web.Common.AspNetCore +namespace Umbraco.Cms.Web.Common.AspNetCore { // TODO: Should be in Views namespace? diff --git a/src/Umbraco.Web.Common/Attributes/IsBackOfficeAttribute.cs b/src/Umbraco.Web.Common/Attributes/IsBackOfficeAttribute.cs index 2c017a5978..15c2d45267 100644 --- a/src/Umbraco.Web.Common/Attributes/IsBackOfficeAttribute.cs +++ b/src/Umbraco.Web.Common/Attributes/IsBackOfficeAttribute.cs @@ -1,7 +1,6 @@ -using Microsoft.AspNetCore.Mvc; -using System; +using System; -namespace Umbraco.Web.Common.Attributes +namespace Umbraco.Cms.Web.Common.Attributes { /// /// When applied to an api controller it will be routed to the /Umbraco/BackOffice prefix route so we can determine if it @@ -9,6 +8,6 @@ namespace Umbraco.Web.Common.Attributes /// [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)] public sealed class IsBackOfficeAttribute : Attribute - { + { } } diff --git a/src/Umbraco.Web.Common/Attributes/PluginControllerAttribute.cs b/src/Umbraco.Web.Common/Attributes/PluginControllerAttribute.cs index 4844200ebf..885558eb65 100644 --- a/src/Umbraco.Web.Common/Attributes/PluginControllerAttribute.cs +++ b/src/Umbraco.Web.Common/Attributes/PluginControllerAttribute.cs @@ -1,8 +1,8 @@ -using Microsoft.AspNetCore.Mvc; -using System; +using System; using System.Linq; +using Microsoft.AspNetCore.Mvc; -namespace Umbraco.Web.Common.Attributes +namespace Umbraco.Cms.Web.Common.Attributes { /// /// Indicates that a controller is a plugin controller and will be routed to its own area. diff --git a/src/Umbraco.Web.Common/Attributes/UmbracoApiControllerAttribute.cs b/src/Umbraco.Web.Common/Attributes/UmbracoApiControllerAttribute.cs index a3ffc3d9e9..abb2e4ff06 100644 --- a/src/Umbraco.Web.Common/Attributes/UmbracoApiControllerAttribute.cs +++ b/src/Umbraco.Web.Common/Attributes/UmbracoApiControllerAttribute.cs @@ -1,7 +1,7 @@ using System; -using Umbraco.Web.Common.ApplicationModels; +using Umbraco.Cms.Web.Common.ApplicationModels; -namespace Umbraco.Web.Common.Attributes +namespace Umbraco.Cms.Web.Common.Attributes { /// /// When present on a controller then conventions will apply diff --git a/src/Umbraco.Web.Common/Authorization/AuthorizationPolicies.cs b/src/Umbraco.Web.Common/Authorization/AuthorizationPolicies.cs index 56070f5033..0ef34a9ced 100644 --- a/src/Umbraco.Web.Common/Authorization/AuthorizationPolicies.cs +++ b/src/Umbraco.Web.Common/Authorization/AuthorizationPolicies.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Web.Common.Authorization +namespace Umbraco.Cms.Web.Common.Authorization { /// /// A list of authorization policy names for use in the back office @@ -26,7 +26,7 @@ public const string MediaPermissionByResource = nameof(MediaPermissionByResource); public const string MediaPermissionPathById = nameof(MediaPermissionPathById); - + // Single section access diff --git a/src/Umbraco.Web.Common/Authorization/FeatureAuthorizeHandler.cs b/src/Umbraco.Web.Common/Authorization/FeatureAuthorizeHandler.cs index 285a2572ad..0a4981d6c6 100644 --- a/src/Umbraco.Web.Common/Authorization/FeatureAuthorizeHandler.cs +++ b/src/Umbraco.Web.Common/Authorization/FeatureAuthorizeHandler.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc.Controllers; using Umbraco.Cms.Core.Features; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.Common.Authorization { /// /// Ensures that the controller is an authorized feature. diff --git a/src/Umbraco.Web.Common/Authorization/FeatureAuthorizeRequirement.cs b/src/Umbraco.Web.Common/Authorization/FeatureAuthorizeRequirement.cs index 87614d7f19..5845df902c 100644 --- a/src/Umbraco.Web.Common/Authorization/FeatureAuthorizeRequirement.cs +++ b/src/Umbraco.Web.Common/Authorization/FeatureAuthorizeRequirement.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Authorization; -namespace Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Web.Common.Authorization { /// diff --git a/src/Umbraco.Web.Common/Constants/ViewConstants.cs b/src/Umbraco.Web.Common/Constants/ViewConstants.cs index 4c87509069..5c8ec4974a 100644 --- a/src/Umbraco.Web.Common/Constants/ViewConstants.cs +++ b/src/Umbraco.Web.Common/Constants/ViewConstants.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Web.Common.Constants +namespace Umbraco.Cms.Web.Common.Constants { /// /// constants diff --git a/src/Umbraco.Web.Common/Controllers/IRenderController.cs b/src/Umbraco.Web.Common/Controllers/IRenderController.cs index 577394abb2..21a5eda83a 100644 --- a/src/Umbraco.Web.Common/Controllers/IRenderController.cs +++ b/src/Umbraco.Web.Common/Controllers/IRenderController.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Core.Composing; -namespace Umbraco.Web.Common.Controllers +namespace Umbraco.Cms.Web.Common.Controllers { /// /// A marker interface to designate that a controller will be used for Umbraco front-end requests and/or route hijacking diff --git a/src/Umbraco.Web.Common/Controllers/PluginController.cs b/src/Umbraco.Web.Common/Controllers/PluginController.cs index 7b1d3418c1..314a863cbf 100644 --- a/src/Umbraco.Web.Common/Controllers/PluginController.cs +++ b/src/Umbraco.Web.Common/Controllers/PluginController.cs @@ -1,22 +1,17 @@ using System; using System.Collections.Concurrent; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Core.Web.Mvc; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; +using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Core.Persistence; -using Umbraco.Core.Services; -using Umbraco.Web.Common.Attributes; using Umbraco.Extensions; -namespace Umbraco.Web.Common.Controllers +namespace Umbraco.Cms.Web.Common.Controllers { /// /// Provides a base class for plugin controllers. diff --git a/src/Umbraco.Web.Common/Controllers/ProxyViewDataFeature.cs b/src/Umbraco.Web.Common/Controllers/ProxyViewDataFeature.cs index a672fdfd3c..f926ccbfaa 100644 --- a/src/Umbraco.Web.Common/Controllers/ProxyViewDataFeature.cs +++ b/src/Umbraco.Web.Common/Controllers/ProxyViewDataFeature.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures; -namespace Umbraco.Web.Common.Controllers +namespace Umbraco.Cms.Web.Common.Controllers { /// /// A request feature to allowing proxying viewdata from one controller to another diff --git a/src/Umbraco.Web.Common/Controllers/PublishedRequestFilterAttribute.cs b/src/Umbraco.Web.Common/Controllers/PublishedRequestFilterAttribute.cs index df3070422b..0d8c0833e1 100644 --- a/src/Umbraco.Web.Common/Controllers/PublishedRequestFilterAttribute.cs +++ b/src/Umbraco.Web.Common/Controllers/PublishedRequestFilterAttribute.cs @@ -3,10 +3,9 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Filters; using Umbraco.Cms.Core.Routing; -using Umbraco.Web.Common.Routing; -using Umbraco.Web.Routing; +using Umbraco.Cms.Web.Common.Routing; -namespace Umbraco.Web.Common.Controllers +namespace Umbraco.Cms.Web.Common.Controllers { /// /// Deals with custom headers for the umbraco request diff --git a/src/Umbraco.Web.Common/Controllers/RenderController.cs b/src/Umbraco.Web.Common/Controllers/RenderController.cs index 811dde721f..de9e51d145 100644 --- a/src/Umbraco.Web.Common/Controllers/RenderController.cs +++ b/src/Umbraco.Web.Common/Controllers/RenderController.cs @@ -4,19 +4,16 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.ViewEngines; -using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Web; -using Umbraco.Web.Common.ActionsResults; -using Umbraco.Web.Common.Filters; -using Umbraco.Web.Common.Routing; -using Umbraco.Web.Models; -using Umbraco.Web.Routing; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Filters; +using Umbraco.Cms.Web.Common.Routing; -namespace Umbraco.Web.Common.Controllers +namespace Umbraco.Cms.Web.Common.Controllers { /// /// Represents the default front-end rendering controller. diff --git a/src/Umbraco.Web.Common/Controllers/UmbracoApiController.cs b/src/Umbraco.Web.Common/Controllers/UmbracoApiController.cs index c70d4432f2..f00f2fec57 100644 --- a/src/Umbraco.Web.Common/Controllers/UmbracoApiController.cs +++ b/src/Umbraco.Web.Common/Controllers/UmbracoApiController.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Core.Composing; -namespace Umbraco.Web.Common.Controllers +namespace Umbraco.Cms.Web.Common.Controllers { /// /// Provides a base class for auto-routed Umbraco API controllers. diff --git a/src/Umbraco.Web.Common/Controllers/UmbracoApiControllerBase.cs b/src/Umbraco.Web.Common/Controllers/UmbracoApiControllerBase.cs index a9bbf453de..8dfd5a76af 100644 --- a/src/Umbraco.Web.Common/Controllers/UmbracoApiControllerBase.cs +++ b/src/Umbraco.Web.Common/Controllers/UmbracoApiControllerBase.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Features; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Authorization; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Authorization; -namespace Umbraco.Web.Common.Controllers +namespace Umbraco.Cms.Web.Common.Controllers { /// /// Provides a base class for Umbraco API controllers. diff --git a/src/Umbraco.Web.Common/Controllers/UmbracoApiControllerTypeCollectionBuilder.cs b/src/Umbraco.Web.Common/Controllers/UmbracoApiControllerTypeCollectionBuilder.cs index 04206596a8..30dec7842b 100644 --- a/src/Umbraco.Web.Common/Controllers/UmbracoApiControllerTypeCollectionBuilder.cs +++ b/src/Umbraco.Web.Common/Controllers/UmbracoApiControllerTypeCollectionBuilder.cs @@ -1,7 +1,7 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; -namespace Umbraco.Web.Common.Controllers +namespace Umbraco.Cms.Web.Common.Controllers { public class UmbracoApiControllerTypeCollectionBuilder : TypeCollectionBuilderBase { diff --git a/src/Umbraco.Web.Common/Controllers/UmbracoController.cs b/src/Umbraco.Web.Common/Controllers/UmbracoController.cs index 22bef0da69..3d714e8e60 100644 --- a/src/Umbraco.Web.Common/Controllers/UmbracoController.cs +++ b/src/Umbraco.Web.Common/Controllers/UmbracoController.cs @@ -1,7 +1,7 @@ using System; using Microsoft.AspNetCore.Mvc; -namespace Umbraco.Web.Common.Controllers +namespace Umbraco.Cms.Web.Common.Controllers { /// /// Provides a base class for Umbraco controllers. diff --git a/src/Umbraco.Web.Common/DependencyInjection/ServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/DependencyInjection/ServiceCollectionExtensions.cs index e97d276103..b764dbec40 100644 --- a/src/Umbraco.Web.Common/DependencyInjection/ServiceCollectionExtensions.cs +++ b/src/Umbraco.Web.Common/DependencyInjection/ServiceCollectionExtensions.cs @@ -10,7 +10,7 @@ using SixLabors.ImageSharp.Web.Processors; using SixLabors.ImageSharp.Web.Providers; using Umbraco.Cms.Core.Configuration.Models; -namespace Umbraco.Web.Common.DependencyInjection +namespace Umbraco.Extensions { public static class ServiceCollectionExtensions { diff --git a/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs index 108029e9c8..590ea3bbc5 100644 --- a/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs @@ -31,32 +31,31 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Templates; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.Common; +using Umbraco.Cms.Web.Common.ApplicationModels; +using Umbraco.Cms.Web.Common.AspNetCore; +using Umbraco.Cms.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Install; +using Umbraco.Cms.Web.Common.Localization; +using Umbraco.Cms.Web.Common.Macros; +using Umbraco.Cms.Web.Common.Middleware; +using Umbraco.Cms.Web.Common.ModelBinders; +using Umbraco.Cms.Web.Common.Mvc; +using Umbraco.Cms.Web.Common.Profiler; +using Umbraco.Cms.Web.Common.Routing; +using Umbraco.Cms.Web.Common.Security; +using Umbraco.Cms.Web.Common.Templates; +using Umbraco.Cms.Web.Common.UmbracoContext; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.SqlSyntax; -using Umbraco.Extensions; using Umbraco.Infrastructure.DependencyInjection; using Umbraco.Infrastructure.HostedServices; using Umbraco.Infrastructure.HostedServices.ServerRegistration; -using Umbraco.Web.Common.ApplicationModels; -using Umbraco.Web.Common.AspNetCore; -using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.Install; -using Umbraco.Web.Common.Localization; -using Umbraco.Web.Common.Macros; -using Umbraco.Web.Common.Middleware; -using Umbraco.Web.Common.ModelBinders; -using Umbraco.Web.Common.Mvc; -using Umbraco.Web.Common.Profiler; -using Umbraco.Web.Common.Routing; -using Umbraco.Web.Common.Security; -using Umbraco.Web.Common.Templates; -using Umbraco.Web.Macros; using Umbraco.Web.Telemetry; -using Umbraco.Web.Website; using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; -namespace Umbraco.Web.Common.DependencyInjection +namespace Umbraco.Extensions { // TODO: We could add parameters to configure each of these for flexibility diff --git a/src/Umbraco.Web.Common/Events/ActionExecutedEventArgs.cs b/src/Umbraco.Web.Common/Events/ActionExecutedEventArgs.cs index b33cbc7d8a..6b0b87c7b7 100644 --- a/src/Umbraco.Web.Common/Events/ActionExecutedEventArgs.cs +++ b/src/Umbraco.Web.Common/Events/ActionExecutedEventArgs.cs @@ -1,7 +1,7 @@ using System; using Microsoft.AspNetCore.Mvc; -namespace Umbraco.Web.Common.Events +namespace Umbraco.Cms.Web.Common.Events { public class ActionExecutedEventArgs : EventArgs { diff --git a/src/Umbraco.Web.Common/Exceptions/HttpUmbracoFormRouteStringException.cs b/src/Umbraco.Web.Common/Exceptions/HttpUmbracoFormRouteStringException.cs index 8ba326a926..a98ab32f8b 100644 --- a/src/Umbraco.Web.Common/Exceptions/HttpUmbracoFormRouteStringException.cs +++ b/src/Umbraco.Web.Common/Exceptions/HttpUmbracoFormRouteStringException.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace Umbraco.Web.Common.Exceptions +namespace Umbraco.Cms.Web.Common.Exceptions { /// /// Exception that occurs when an Umbraco form route string is invalid diff --git a/src/Umbraco.Web.Common/Extensions/ActionResultExtensions.cs b/src/Umbraco.Web.Common/Extensions/ActionResultExtensions.cs index edb0749133..21bfd6f9ba 100644 --- a/src/Umbraco.Web.Common/Extensions/ActionResultExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/ActionResultExtensions.cs @@ -1,6 +1,4 @@ using System.Net; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Infrastructure; diff --git a/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs b/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs index d8cda44711..75a5f95f21 100644 --- a/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs @@ -1,7 +1,6 @@ using System; using System.IO; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Localization; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Serilog.Context; @@ -13,15 +12,12 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; -using Umbraco.Core; +using Umbraco.Cms.Web.Common.Middleware; +using Umbraco.Cms.Web.Common.Plugins; using Umbraco.Infrastructure.Logging.Serilog.Enrichers; -using Umbraco.Web.Common.Middleware; -using Umbraco.Web.Common.Plugins; -using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Extensions { - /// /// extensions for Umbraco /// diff --git a/src/Umbraco.Web.Common/Extensions/BlockListTemplateExtensions.cs b/src/Umbraco.Web.Common/Extensions/BlockListTemplateExtensions.cs index 901eb8c273..0fd5df73aa 100644 --- a/src/Umbraco.Web.Common/Extensions/BlockListTemplateExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/BlockListTemplateExtensions.cs @@ -1,10 +1,8 @@ using System; using Microsoft.AspNetCore.Html; using Microsoft.AspNetCore.Mvc.Rendering; -using Microsoft.AspNetCore.Mvc.ViewFeatures; using Umbraco.Cms.Core.Models.Blocks; using Umbraco.Cms.Core.Models.PublishedContent; -using Umbraco.Core.Models.Blocks; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs b/src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs index d042f113a1..d52d140640 100644 --- a/src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs @@ -7,7 +7,6 @@ using Umbraco.Cms.Core.Hosting; namespace Umbraco.Extensions { - /// /// Extension methods for the cache helper /// diff --git a/src/Umbraco.Web.Common/Extensions/ControllerExtensions.cs b/src/Umbraco.Web.Common/Extensions/ControllerExtensions.cs index 2aa6c5eacb..b5f665ae9c 100644 --- a/src/Umbraco.Web.Common/Extensions/ControllerExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/ControllerExtensions.cs @@ -2,8 +2,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Mvc; -using Umbraco.Core; -using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Extensions { @@ -21,7 +19,7 @@ namespace Umbraco.Extensions return AuthenticateResult.NoResult(); } - var result = await controller.HttpContext.AuthenticateAsync(Constants.Security.BackOfficeAuthenticationType); + var result = await controller.HttpContext.AuthenticateAsync(Cms.Core.Constants.Security.BackOfficeAuthenticationType); return result; } diff --git a/src/Umbraco.Web.Common/Extensions/FormCollectionExtensions.cs b/src/Umbraco.Web.Common/Extensions/FormCollectionExtensions.cs index 52efaf5791..03ec2ce8af 100644 --- a/src/Umbraco.Web.Common/Extensions/FormCollectionExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/FormCollectionExtensions.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using Microsoft.AspNetCore.Http; -using Umbraco.Cms.Core; -using Umbraco.Core; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.Common/Extensions/HttpContextExtensions.cs b/src/Umbraco.Web.Common/Extensions/HttpContextExtensions.cs index ed9a27389e..6579c69536 100644 --- a/src/Umbraco.Web.Common/Extensions/HttpContextExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/HttpContextExtensions.cs @@ -1,12 +1,8 @@ -using Microsoft.AspNetCore.Http; -using System; -using System.Collections.Generic; +using System; using System.Security.Claims; -using System.Security.Principal; -using System.Text; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Umbraco.Cms.Core.Security; -using Umbraco.Core.Security; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.Common/Extensions/HttpRequestExtensions.cs b/src/Umbraco.Web.Common/Extensions/HttpRequestExtensions.cs index ae0ecdb2b0..c7c2bb3115 100644 --- a/src/Umbraco.Web.Common/Extensions/HttpRequestExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/HttpRequestExtensions.cs @@ -4,10 +4,7 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Routing; -using Umbraco.Core; -using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Extensions { @@ -20,7 +17,7 @@ namespace Umbraco.Extensions /// Check if a preview cookie exist /// public static bool HasPreviewCookie(this HttpRequest request) - => request.Cookies.TryGetValue(Constants.Web.PreviewCookieName, out var cookieVal) && !cookieVal.IsNullOrWhiteSpace(); + => request.Cookies.TryGetValue(Cms.Core.Constants.Web.PreviewCookieName, out var cookieVal) && !cookieVal.IsNullOrWhiteSpace(); /// /// Returns true if the request is a back office request diff --git a/src/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensions.cs b/src/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensions.cs index 56d46cafd5..b3a92bfb2c 100644 --- a/src/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensions.cs @@ -1,17 +1,11 @@ using System; -using Newtonsoft.Json.Linq; using System.Globalization; -using Umbraco.Cms.Core; +using Newtonsoft.Json.Linq; using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Routing; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors.ValueConverters; -using Umbraco.Web.Models; -using Umbraco.Web.Routing; -using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Extensions { @@ -135,7 +129,7 @@ namespace Umbraco.Extensions IPublishedUrlProvider publishedUrlProvider, int? width = null, int? height = null, - string propertyAlias = Constants.Conventions.Media.File, + string propertyAlias = Cms.Core.Constants.Conventions.Media.File, string cropAlias = null, int? quality = null, ImageCropMode? imageCropMode = null, diff --git a/src/Umbraco.Web.Common/Extensions/ImageCropperTemplateExtensions.cs b/src/Umbraco.Web.Common/Extensions/ImageCropperTemplateExtensions.cs index 5da2f8dcc8..330ebf7f6a 100644 --- a/src/Umbraco.Web.Common/Extensions/ImageCropperTemplateExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/ImageCropperTemplateExtensions.cs @@ -1,10 +1,9 @@ using System; using System.Globalization; -using Newtonsoft.Json; -using Umbraco.Core; -using Umbraco.Core.PropertyEditors.ValueConverters; using Microsoft.Extensions.Logging; +using Newtonsoft.Json; using Umbraco.Cms.Core; +using Umbraco.Core.PropertyEditors.ValueConverters; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs b/src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs index b4507af7bd..e0a6802a8d 100644 --- a/src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs @@ -9,9 +9,8 @@ using Microsoft.AspNetCore.Routing; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Web.Mvc; -using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.Install; -using Constants = Umbraco.Cms.Core.Constants; +using Umbraco.Cms.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Install; namespace Umbraco.Extensions { @@ -37,14 +36,14 @@ namespace Umbraco.Extensions return hostingEnvironment.ApplicationVirtualPath; // this would indicate that the installer is installed without the back office } - return linkGenerator.GetPathByAction("Default", ControllerExtensions.GetControllerName(backOfficeControllerType), values: new { area = Constants.Web.Mvc.BackOfficeApiArea }); + return linkGenerator.GetPathByAction("Default", ControllerExtensions.GetControllerName(backOfficeControllerType), values: new { area = Cms.Core.Constants.Web.Mvc.BackOfficeApiArea }); } /// /// Returns the URL for the installer /// public static string GetInstallerUrl(this LinkGenerator linkGenerator) - => linkGenerator.GetPathByAction(nameof(InstallController.Index), ControllerExtensions.GetControllerName(), new { area = Constants.Web.Mvc.InstallArea }); + => linkGenerator.GetPathByAction(nameof(InstallController.Index), ControllerExtensions.GetControllerName(), new { area = Cms.Core.Constants.Web.Mvc.InstallArea }); /// /// Returns the URL for the installer api @@ -53,7 +52,7 @@ namespace Umbraco.Extensions => linkGenerator.GetPathByAction( nameof(InstallApiController.GetSetup), ControllerExtensions.GetControllerName(), - new { area = Constants.Web.Mvc.InstallArea }).TrimEnd(nameof(InstallApiController.GetSetup)); + new { area = Cms.Core.Constants.Web.Mvc.InstallArea }).TrimEnd(nameof(InstallApiController.GetSetup)); /// /// Return the Url for a Web Api service diff --git a/src/Umbraco.Web.Common/Extensions/TypeLoaderExtensions.cs b/src/Umbraco.Web.Common/Extensions/TypeLoaderExtensions.cs index 0d99b98f10..f8d682d76b 100644 --- a/src/Umbraco.Web.Common/Extensions/TypeLoaderExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/TypeLoaderExtensions.cs @@ -1,8 +1,7 @@ using System; using System.Collections.Generic; -using System.Text; using Umbraco.Cms.Core.Composing; -using Umbraco.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Controllers; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs index c24bfc6375..f2375dd764 100644 --- a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs @@ -7,25 +7,17 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Serilog; using Serilog.Extensions.Hosting; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Configuration.Models; -using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Logging; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; using Umbraco.Core.Logging.Serilog; -using Umbraco.Core.Runtime; -using Umbraco.Web.Common.AspNetCore; -using Umbraco.Web.Common.Profiler; using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; namespace Umbraco.Extensions { public static class UmbracoCoreServiceCollectionExtensions { - /// /// Create and configure the logger /// @@ -77,7 +69,7 @@ namespace Umbraco.Extensions IProfilingLogger profilingLogger) { - var typeFinderSettings = config.GetSection(Constants.Configuration.ConfigTypeFinder).Get() ?? new TypeFinderSettings(); + var typeFinderSettings = config.GetSection(Cms.Core.Constants.Configuration.ConfigTypeFinder).Get() ?? new TypeFinderSettings(); var runtimeHashPaths = new RuntimeHashPaths().AddFolder(new DirectoryInfo(Path.Combine(webHostEnvironment.ContentRootPath, "bin"))); var runtimeHash = new RuntimeHash(profilingLogger, runtimeHashPaths); diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoInstallApplicationBuilderExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoInstallApplicationBuilderExtensions.cs index ac5d787911..40c5c63642 100644 --- a/src/Umbraco.Web.Common/Extensions/UmbracoInstallApplicationBuilderExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/UmbracoInstallApplicationBuilderExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; -using Umbraco.Web.Common.Install; +using Umbraco.Cms.Web.Common.Install; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.Common/Extensions/UrlHelperExtensions.cs b/src/Umbraco.Web.Common/Extensions/UrlHelperExtensions.cs index 841b98bc23..413e1eb187 100644 --- a/src/Umbraco.Web.Common/Extensions/UrlHelperExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/UrlHelperExtensions.cs @@ -8,17 +8,12 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.WebAssets; -using Umbraco.Web.Common.Controllers; -using Constants = Umbraco.Cms.Core.Constants; +using Umbraco.Cms.Web.Common.Controllers; namespace Umbraco.Extensions { - public static class UrlHelperExtensions { - - - /// /// Return the back office url if the back office is installed /// @@ -28,7 +23,7 @@ namespace Umbraco.Extensions { var backOfficeControllerType = Type.GetType("Umbraco.Web.BackOffice.Controllers"); if (backOfficeControllerType == null) return "/"; // this would indicate that the installer is installed without the back office - return url.Action("Default", ControllerExtensions.GetControllerName(backOfficeControllerType), new { area = Constants.Web.Mvc.BackOfficeApiArea }); + return url.Action("Default", ControllerExtensions.GetControllerName(backOfficeControllerType), new { area = Cms.Core.Constants.Web.Mvc.BackOfficeApiArea }); } /// diff --git a/src/Umbraco.Web.Common/Extensions/ViewDataExtensions.cs b/src/Umbraco.Web.Common/Extensions/ViewDataExtensions.cs index e13812e883..36adacc2d2 100644 --- a/src/Umbraco.Web.Common/Extensions/ViewDataExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/ViewDataExtensions.cs @@ -1,15 +1,10 @@ using System; -using System.Collections.Generic; using System.Text; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Semver; using Umbraco.Cms.Core.Serialization; -using Umbraco.Core; -using Umbraco.Core.Security; -using Umbraco.Core.Serialization; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.Common/Filters/AngularJsonOnlyConfigurationAttribute.cs b/src/Umbraco.Web.Common/Filters/AngularJsonOnlyConfigurationAttribute.cs index 05abe6cfbc..542013577d 100644 --- a/src/Umbraco.Web.Common/Filters/AngularJsonOnlyConfigurationAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/AngularJsonOnlyConfigurationAttribute.cs @@ -5,9 +5,9 @@ using Microsoft.Extensions.Options; using Newtonsoft.Json; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Serialization; -using Umbraco.Web.Common.Formatters; +using Umbraco.Cms.Web.Common.Formatters; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { /// /// Applying this attribute to any controller will ensure that it only contains one json formatter compatible with the angular json vulnerability prevention. diff --git a/src/Umbraco.Web.Common/Filters/BackOfficeCultureFilter.cs b/src/Umbraco.Web.Common/Filters/BackOfficeCultureFilter.cs index 1b04c68def..cf3fe4cf9e 100644 --- a/src/Umbraco.Web.Common/Filters/BackOfficeCultureFilter.cs +++ b/src/Umbraco.Web.Common/Filters/BackOfficeCultureFilter.cs @@ -5,7 +5,7 @@ using System.Globalization; using Microsoft.AspNetCore.Mvc.Filters; using Umbraco.Extensions; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { /// /// Applied to all Umbraco controllers to ensure the thread culture is set to the culture assigned to the back office identity diff --git a/src/Umbraco.Web.Common/Filters/DisableBrowserCacheAttribute.cs b/src/Umbraco.Web.Common/Filters/DisableBrowserCacheAttribute.cs index 0fe251bac4..8d7b5c6284 100644 --- a/src/Umbraco.Web.Common/Filters/DisableBrowserCacheAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/DisableBrowserCacheAttribute.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Net.Http.Headers; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { /// /// Ensures that the request is not cached by the browser diff --git a/src/Umbraco.Web.Common/Filters/EnsurePartialViewMacroViewContextFilterAttribute.cs b/src/Umbraco.Web.Common/Filters/EnsurePartialViewMacroViewContextFilterAttribute.cs index c53c367689..e09cc83dd3 100644 --- a/src/Umbraco.Web.Common/Filters/EnsurePartialViewMacroViewContextFilterAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/EnsurePartialViewMacroViewContextFilterAttribute.cs @@ -5,10 +5,10 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Umbraco.Web.Common.Constants; -using Umbraco.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Constants; +using Umbraco.Cms.Web.Common.Controllers; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { /// /// This is a special filter which is required for the RTE to be able to render Partial View Macros that diff --git a/src/Umbraco.Web.Common/Filters/ExceptionViewModel.cs b/src/Umbraco.Web.Common/Filters/ExceptionViewModel.cs index 917e00bb02..082f65cfdf 100644 --- a/src/Umbraco.Web.Common/Filters/ExceptionViewModel.cs +++ b/src/Umbraco.Web.Common/Filters/ExceptionViewModel.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { public class ExceptionViewModel { diff --git a/src/Umbraco.Web.Common/Filters/JsonDateTimeFormatAttribute.cs b/src/Umbraco.Web.Common/Filters/JsonDateTimeFormatAttribute.cs index edf8489f12..8e4b04c678 100644 --- a/src/Umbraco.Web.Common/Filters/JsonDateTimeFormatAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/JsonDateTimeFormatAttribute.cs @@ -1,14 +1,12 @@ using System.Buffers; -using System.Linq; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.Formatters; using Microsoft.Extensions.Options; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -using Umbraco.Web.Common.Formatters; +using Umbraco.Cms.Web.Common.Formatters; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { /// /// Applying this attribute to any controller will ensure that it only contains one json formatter compatible with the angular json vulnerability prevention. diff --git a/src/Umbraco.Web.Common/Filters/JsonExceptionFilterAttribute.cs b/src/Umbraco.Web.Common/Filters/JsonExceptionFilterAttribute.cs index 77880e022c..098192365d 100644 --- a/src/Umbraco.Web.Common/Filters/JsonExceptionFilterAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/JsonExceptionFilterAttribute.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Newtonsoft.Json; using Umbraco.Cms.Core.Hosting; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { public class JsonExceptionFilterAttribute : TypeFilterAttribute { diff --git a/src/Umbraco.Web.Common/Filters/ModelBindingExceptionAttribute.cs b/src/Umbraco.Web.Common/Filters/ModelBindingExceptionAttribute.cs index ea31fb81f3..87d611947e 100644 --- a/src/Umbraco.Web.Common/Filters/ModelBindingExceptionAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/ModelBindingExceptionAttribute.cs @@ -7,10 +7,10 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Cms.Web.Common.ModelBinders; using Umbraco.Extensions; -using Umbraco.Web.Common.ModelBinders; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { /// /// An exception filter checking if we get a or with the same model. diff --git a/src/Umbraco.Web.Common/Filters/OutgoingNoHyphenGuidFormatAttribute.cs b/src/Umbraco.Web.Common/Filters/OutgoingNoHyphenGuidFormatAttribute.cs index 29358392c5..602438008b 100644 --- a/src/Umbraco.Web.Common/Filters/OutgoingNoHyphenGuidFormatAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/OutgoingNoHyphenGuidFormatAttribute.cs @@ -4,10 +4,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Options; using Newtonsoft.Json; +using Umbraco.Cms.Web.Common.Formatters; using Umbraco.Extensions; -using Umbraco.Web.Common.Formatters; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { public class OutgoingNoHyphenGuidFormatAttribute : TypeFilterAttribute { diff --git a/src/Umbraco.Web.Common/Filters/StatusCodeResultAttribute.cs b/src/Umbraco.Web.Common/Filters/StatusCodeResultAttribute.cs index f9a4314e9c..98f6d2232c 100644 --- a/src/Umbraco.Web.Common/Filters/StatusCodeResultAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/StatusCodeResultAttribute.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { /// /// Forces the response to have a specific http status code diff --git a/src/Umbraco.Web.Common/Filters/UmbracoMemberAuthorizeAttribute.cs b/src/Umbraco.Web.Common/Filters/UmbracoMemberAuthorizeAttribute.cs index cc6058121b..603a9c421b 100644 --- a/src/Umbraco.Web.Common/Filters/UmbracoMemberAuthorizeAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/UmbracoMemberAuthorizeAttribute.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { /// /// Ensures authorization is successful for a website user (member). diff --git a/src/Umbraco.Web.Common/Filters/UmbracoMemberAuthorizeFilter.cs b/src/Umbraco.Web.Common/Filters/UmbracoMemberAuthorizeFilter.cs index de53a4b0c7..24c82ee23b 100644 --- a/src/Umbraco.Web.Common/Filters/UmbracoMemberAuthorizeFilter.cs +++ b/src/Umbraco.Web.Common/Filters/UmbracoMemberAuthorizeFilter.cs @@ -1,13 +1,10 @@ -using Microsoft.AspNetCore.Mvc; +using System.Collections.Generic; +using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using System.Collections.Generic; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Security; -using Umbraco.Core; -using Umbraco.Core.Security; using Umbraco.Extensions; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { /// diff --git a/src/Umbraco.Web.Common/Filters/UmbracoUserTimeoutFilterAttribute.cs b/src/Umbraco.Web.Common/Filters/UmbracoUserTimeoutFilterAttribute.cs index a888c94bd8..b42962140d 100644 --- a/src/Umbraco.Web.Common/Filters/UmbracoUserTimeoutFilterAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/UmbracoUserTimeoutFilterAttribute.cs @@ -1,10 +1,9 @@ using System.Globalization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Umbraco.Cms.Core.Security; using Umbraco.Extensions; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { /// /// This will check if the user making the request is authenticated and if there's an auth ticket tied to the user diff --git a/src/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringAttribute.cs b/src/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringAttribute.cs index 5783d0bdc0..ed86d7c783 100644 --- a/src/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringAttribute.cs @@ -3,12 +3,12 @@ using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; +using Umbraco.Cms.Web.Common.Constants; +using Umbraco.Cms.Web.Common.Exceptions; +using Umbraco.Cms.Web.Common.Security; using Umbraco.Extensions; -using Umbraco.Web.Common.Constants; -using Umbraco.Web.Common.Exceptions; -using Umbraco.Web.Common.Security; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { /// diff --git a/src/Umbraco.Web.Common/Formatters/AngularJsonMediaTypeFormatter.cs b/src/Umbraco.Web.Common/Formatters/AngularJsonMediaTypeFormatter.cs index 3dd5e8330f..d0558442f9 100644 --- a/src/Umbraco.Web.Common/Formatters/AngularJsonMediaTypeFormatter.cs +++ b/src/Umbraco.Web.Common/Formatters/AngularJsonMediaTypeFormatter.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using Umbraco.Core.Serialization; -namespace Umbraco.Web.Common.Formatters +namespace Umbraco.Cms.Web.Common.Formatters { /// /// This will format the JSON output for use with AngularJs's approach to JSON Vulnerability attacks diff --git a/src/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolver.cs b/src/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolver.cs index 49e65d4a3b..1988afcaef 100644 --- a/src/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolver.cs +++ b/src/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolver.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace Umbraco.Web.Common.Formatters +namespace Umbraco.Cms.Web.Common.Formatters { public class IgnoreRequiredAttributesResolver : DefaultContractResolver { diff --git a/src/Umbraco.Web.Common/Install/InstallApiController.cs b/src/Umbraco.Web.Common/Install/InstallApiController.cs index 55dfa4c9a0..1db4bdd7f1 100644 --- a/src/Umbraco.Web.Common/Install/InstallApiController.cs +++ b/src/Umbraco.Web.Common/Install/InstallApiController.cs @@ -10,14 +10,14 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Install; using Umbraco.Cms.Core.Install.Models; using Umbraco.Cms.Core.Logging; +using Umbraco.Cms.Web.Common.ActionsResults; +using Umbraco.Cms.Web.Common.Attributes; +using Umbraco.Cms.Web.Common.Filters; using Umbraco.Core.Migrations.Install; using Umbraco.Extensions; -using Umbraco.Web.Common.ActionsResults; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Filters; using Umbraco.Web.Install; -namespace Umbraco.Web.Common.Install +namespace Umbraco.Cms.Web.Common.Install { [UmbracoApiController] [AngularJsonOnlyConfiguration] diff --git a/src/Umbraco.Web.Common/Install/InstallAreaRoutes.cs b/src/Umbraco.Web.Common/Install/InstallAreaRoutes.cs index 04e2a0fa02..6a89d3b770 100644 --- a/src/Umbraco.Web.Common/Install/InstallAreaRoutes.cs +++ b/src/Umbraco.Web.Common/Install/InstallAreaRoutes.cs @@ -4,10 +4,10 @@ using Microsoft.AspNetCore.Routing; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Extensions; -using Umbraco.Web.Common.Routing; -namespace Umbraco.Web.Common.Install +namespace Umbraco.Cms.Web.Common.Install { public class InstallAreaRoutes : IAreaRoutes diff --git a/src/Umbraco.Web.Common/Install/InstallAuthorizeAttribute.cs b/src/Umbraco.Web.Common/Install/InstallAuthorizeAttribute.cs index a24714d3bc..71482db274 100644 --- a/src/Umbraco.Web.Common/Install/InstallAuthorizeAttribute.cs +++ b/src/Umbraco.Web.Common/Install/InstallAuthorizeAttribute.cs @@ -4,10 +4,8 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Security; -namespace Umbraco.Web.Common.Install +namespace Umbraco.Cms.Web.Common.Install { /// /// Ensures authorization occurs for the installer if it has already completed. diff --git a/src/Umbraco.Web.Common/Install/InstallController.cs b/src/Umbraco.Web.Common/Install/InstallController.cs index 72565c6cfa..823e1a8305 100644 --- a/src/Umbraco.Web.Common/Install/InstallController.cs +++ b/src/Umbraco.Web.Common/Install/InstallController.cs @@ -1,17 +1,10 @@ using System.IO; +using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Extensions; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; -using System.Threading.Tasks; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Security; -using Umbraco.Extensions; -using Umbraco.Web.Common.Filters; -using Umbraco.Web.Install; using Microsoft.Extensions.Options; -using Microsoft.AspNetCore.Authentication; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; @@ -19,8 +12,11 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.WebAssets; +using Umbraco.Extensions; +using Umbraco.Cms.Web.Common.Filters; +using Umbraco.Web.Install; -namespace Umbraco.Web.Common.Install +namespace Umbraco.Cms.Web.Common.Install { /// diff --git a/src/Umbraco.Web.Common/Localization/UmbracoBackOfficeIdentityCultureProvider.cs b/src/Umbraco.Web.Common/Localization/UmbracoBackOfficeIdentityCultureProvider.cs index 53d8178c03..d7d10fe67f 100644 --- a/src/Umbraco.Web.Common/Localization/UmbracoBackOfficeIdentityCultureProvider.cs +++ b/src/Umbraco.Web.Common/Localization/UmbracoBackOfficeIdentityCultureProvider.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Localization; using Umbraco.Extensions; -namespace Umbraco.Web.Common.Localization +namespace Umbraco.Cms.Web.Common.Localization { /// /// Sets the request culture to the culture of the back office user if one is determined to be in the request diff --git a/src/Umbraco.Web.Common/Localization/UmbracoPublishedContentCultureProvider.cs b/src/Umbraco.Web.Common/Localization/UmbracoPublishedContentCultureProvider.cs index f518772013..ab3f4ccc77 100644 --- a/src/Umbraco.Web.Common/Localization/UmbracoPublishedContentCultureProvider.cs +++ b/src/Umbraco.Web.Common/Localization/UmbracoPublishedContentCultureProvider.cs @@ -5,14 +5,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Localization; -using Microsoft.AspNetCore.Routing; -using Microsoft.Extensions.Options; using Microsoft.Extensions.Primitives; using Umbraco.Cms.Core.Routing; -using Umbraco.Web.Common.Routing; -using Umbraco.Web.Routing; +using Umbraco.Cms.Web.Common.Routing; -namespace Umbraco.Web.Common.Localization +namespace Umbraco.Cms.Web.Common.Localization { /// /// Sets the request culture to the culture of the if one is found in the request diff --git a/src/Umbraco.Web.Common/Localization/UmbracoRequestLocalizationOptions.cs b/src/Umbraco.Web.Common/Localization/UmbracoRequestLocalizationOptions.cs index ebfe2353d2..9d8718a5f4 100644 --- a/src/Umbraco.Web.Common/Localization/UmbracoRequestLocalizationOptions.cs +++ b/src/Umbraco.Web.Common/Localization/UmbracoRequestLocalizationOptions.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Localization; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; -namespace Umbraco.Web.Common.Localization +namespace Umbraco.Cms.Web.Common.Localization { /// /// Custom Umbraco options configuration for diff --git a/src/Umbraco.Web.Common/Macros/MacroRenderer.cs b/src/Umbraco.Web.Common/Macros/MacroRenderer.cs index 04850bed20..f798199012 100644 --- a/src/Umbraco.Web.Common/Macros/MacroRenderer.cs +++ b/src/Umbraco.Web.Common/Macros/MacroRenderer.cs @@ -18,9 +18,8 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; using Umbraco.Extensions; -using Umbraco.Web.Common.Macros; -namespace Umbraco.Web.Macros +namespace Umbraco.Cms.Web.Common.Macros { public class MacroRenderer : IMacroRenderer { diff --git a/src/Umbraco.Web.Common/Macros/MemberUserKeyProvider.cs b/src/Umbraco.Web.Common/Macros/MemberUserKeyProvider.cs index 296fe7df5b..0d9fce3fc7 100644 --- a/src/Umbraco.Web.Common/Macros/MemberUserKeyProvider.cs +++ b/src/Umbraco.Web.Common/Macros/MemberUserKeyProvider.cs @@ -1,7 +1,6 @@ using Umbraco.Cms.Core.Security; -using Umbraco.Core.Security; -namespace Umbraco.Web.Common.Macros +namespace Umbraco.Cms.Web.Common.Macros { internal class MemberUserKeyProvider : IMemberUserKeyProvider { diff --git a/src/Umbraco.Web.Common/Macros/PartialViewMacroEngine.cs b/src/Umbraco.Web.Common/Macros/PartialViewMacroEngine.cs index 61f4e5c400..ef59c9f896 100644 --- a/src/Umbraco.Web.Common/Macros/PartialViewMacroEngine.cs +++ b/src/Umbraco.Web.Common/Macros/PartialViewMacroEngine.cs @@ -17,10 +17,9 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Macros; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Extensions; -using Umbraco.Web.Macros; using static Umbraco.Cms.Core.Constants.Web.Routing; -namespace Umbraco.Web.Common.Macros +namespace Umbraco.Cms.Web.Common.Macros { /// /// A macro engine using MVC Partial Views to execute. diff --git a/src/Umbraco.Web.Common/Macros/PartialViewMacroPage.cs b/src/Umbraco.Web.Common/Macros/PartialViewMacroPage.cs index ba9575a0ea..82a7a7b036 100644 --- a/src/Umbraco.Web.Common/Macros/PartialViewMacroPage.cs +++ b/src/Umbraco.Web.Common/Macros/PartialViewMacroPage.cs @@ -1,8 +1,7 @@ using Umbraco.Cms.Core.Models; -using Umbraco.Web.Common.AspNetCore; -using Umbraco.Web.Models; +using Umbraco.Cms.Web.Common.AspNetCore; -namespace Umbraco.Web.Common.Macros +namespace Umbraco.Cms.Web.Common.Macros { /// /// The base view class that PartialViewMacro views need to inherit from diff --git a/src/Umbraco.Web.Common/Macros/PartialViewMacroViewComponent.cs b/src/Umbraco.Web.Common/Macros/PartialViewMacroViewComponent.cs index 73d18c731d..2b317585b4 100644 --- a/src/Umbraco.Web.Common/Macros/PartialViewMacroViewComponent.cs +++ b/src/Umbraco.Web.Common/Macros/PartialViewMacroViewComponent.cs @@ -1,16 +1,12 @@ -using System.Collections.Generic; -using Umbraco.Web.Models; -using System.Linq; +using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.ViewEngines; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Macros; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; -namespace Umbraco.Web.Macros +namespace Umbraco.Cms.Web.Common.Macros { /// /// Controller to render macro content for Partial View Macros diff --git a/src/Umbraco.Web.Common/Middleware/BootFailedMiddleware.cs b/src/Umbraco.Web.Common/Middleware/BootFailedMiddleware.cs index e9b58ae4e0..718d2f3a4c 100644 --- a/src/Umbraco.Web.Common/Middleware/BootFailedMiddleware.cs +++ b/src/Umbraco.Web.Common/Middleware/BootFailedMiddleware.cs @@ -1,12 +1,10 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Exceptions; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -namespace Umbraco.Web.Common.Middleware +namespace Umbraco.Cms.Web.Common.Middleware { /// /// Executes when Umbraco booting fails in order to show the problem diff --git a/src/Umbraco.Web.Common/Middleware/UmbracoRequestLoggingMiddleware.cs b/src/Umbraco.Web.Common/Middleware/UmbracoRequestLoggingMiddleware.cs index 1bda56bd37..57c50d4f46 100644 --- a/src/Umbraco.Web.Common/Middleware/UmbracoRequestLoggingMiddleware.cs +++ b/src/Umbraco.Web.Common/Middleware/UmbracoRequestLoggingMiddleware.cs @@ -1,13 +1,10 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Extensions; using Serilog.Context; -using Umbraco.Core; using Umbraco.Core.Logging.Serilog.Enrichers; using Umbraco.Extensions; -namespace Umbraco.Web.Common.Middleware +namespace Umbraco.Cms.Web.Common.Middleware { /// /// Adds request based serilog enrichers to the LogContext for each request @@ -16,7 +13,7 @@ namespace Umbraco.Web.Common.Middleware { private readonly HttpSessionIdEnricher _sessionIdEnricher; private readonly HttpRequestNumberEnricher _requestNumberEnricher; - private readonly HttpRequestIdEnricher _requestIdEnricher; + private readonly HttpRequestIdEnricher _requestIdEnricher; public UmbracoRequestLoggingMiddleware( HttpSessionIdEnricher sessionIdEnricher, diff --git a/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs index fc309bb332..74651d8087 100644 --- a/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs +++ b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs @@ -12,14 +12,11 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Infrastructure.PublishedCache; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Events; +using Umbraco.Cms.Web.Common.Profiler; using Umbraco.Core.Logging; using Umbraco.Extensions; -using Umbraco.Web.Common.Profiler; -namespace Umbraco.Web.Common.Middleware +namespace Umbraco.Cms.Web.Common.Middleware { /// diff --git a/src/Umbraco.Web.Common/ModelBinders/ContentModelBinder.cs b/src/Umbraco.Web.Common/ModelBinders/ContentModelBinder.cs index 0867e8880e..564e0992b5 100644 --- a/src/Umbraco.Web.Common/ModelBinders/ContentModelBinder.cs +++ b/src/Umbraco.Web.Common/ModelBinders/ContentModelBinder.cs @@ -6,10 +6,10 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Extensions; -using Umbraco.Web.Common.Routing; -namespace Umbraco.Web.Common.ModelBinders +namespace Umbraco.Cms.Web.Common.ModelBinders { /// diff --git a/src/Umbraco.Web.Common/ModelBinders/ContentModelBinderProvider.cs b/src/Umbraco.Web.Common/ModelBinders/ContentModelBinderProvider.cs index 146c823bea..1e07d05985 100644 --- a/src/Umbraco.Web.Common/ModelBinders/ContentModelBinderProvider.cs +++ b/src/Umbraco.Web.Common/ModelBinders/ContentModelBinderProvider.cs @@ -2,9 +2,8 @@ using Microsoft.AspNetCore.Mvc.ModelBinding.Binders; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; -using Umbraco.Web.Models; -namespace Umbraco.Web.Common.ModelBinders +namespace Umbraco.Cms.Web.Common.ModelBinders { /// /// The provider for mapping view models, supporting mapping to and from any IPublishedContent or IContentModel. diff --git a/src/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinder.cs b/src/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinder.cs index b0df28721b..a8c09475d9 100644 --- a/src/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinder.cs +++ b/src/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinder.cs @@ -4,11 +4,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.Extensions.Primitives; -using Umbraco.Cms.Core; -using Umbraco.Core; using Umbraco.Extensions; -namespace Umbraco.Web.Common.ModelBinders +namespace Umbraco.Cms.Web.Common.ModelBinders { /// /// Allows an Action to execute with an arbitrary number of QueryStrings diff --git a/src/Umbraco.Web.Common/ModelBinders/ModelBindingError.cs b/src/Umbraco.Web.Common/ModelBinders/ModelBindingError.cs index c55d4af7b4..f32d1273a4 100644 --- a/src/Umbraco.Web.Common/ModelBinders/ModelBindingError.cs +++ b/src/Umbraco.Web.Common/ModelBinders/ModelBindingError.cs @@ -1,9 +1,8 @@ using System; using System.Text; using Umbraco.Cms.Core.Events; -using Umbraco.Core.Events; -namespace Umbraco.Web.Common.ModelBinders +namespace Umbraco.Cms.Web.Common.ModelBinders { /// /// Contains event data for the event. diff --git a/src/Umbraco.Web.Common/ModelBinders/ModelBindingException.cs b/src/Umbraco.Web.Common/ModelBinders/ModelBindingException.cs index 66ad642412..d8418b17a6 100644 --- a/src/Umbraco.Web.Common/ModelBinders/ModelBindingException.cs +++ b/src/Umbraco.Web.Common/ModelBinders/ModelBindingException.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace Umbraco.Web.Common.ModelBinders +namespace Umbraco.Cms.Web.Common.ModelBinders { /// /// The exception that is thrown when an error occurs while binding a source to a model. diff --git a/src/Umbraco.Web.Common/ModelBinders/UmbracoJsonModelBinder.cs b/src/Umbraco.Web.Common/ModelBinders/UmbracoJsonModelBinder.cs index 7069344bda..e681785f20 100644 --- a/src/Umbraco.Web.Common/ModelBinders/UmbracoJsonModelBinder.cs +++ b/src/Umbraco.Web.Common/ModelBinders/UmbracoJsonModelBinder.cs @@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Binders; using Microsoft.Extensions.Logging; using Microsoft.Extensions.ObjectPool; -using Umbraco.Web.Common.Formatters; +using Umbraco.Cms.Web.Common.Formatters; -namespace Umbraco.Web.Common.ModelBinders +namespace Umbraco.Cms.Web.Common.ModelBinders { /// /// A custom body model binder that only uses a to bind body action parameters diff --git a/src/Umbraco.Web.Common/Mvc/HtmlStringUtilities.cs b/src/Umbraco.Web.Common/Mvc/HtmlStringUtilities.cs index 204bb61425..21e4ce0320 100644 --- a/src/Umbraco.Web.Common/Mvc/HtmlStringUtilities.cs +++ b/src/Umbraco.Web.Common/Mvc/HtmlStringUtilities.cs @@ -7,7 +7,7 @@ using System.Web; using HtmlAgilityPack; using Microsoft.AspNetCore.Html; -namespace Umbraco.Web.Common.Mvc +namespace Umbraco.Cms.Web.Common.Mvc { /// /// Provides utility methods for UmbracoHelper for working with strings and HTML in views. diff --git a/src/Umbraco.Web.Common/Mvc/UmbracoMvcConfigureOptions.cs b/src/Umbraco.Web.Common/Mvc/UmbracoMvcConfigureOptions.cs index c212334560..15927a4404 100644 --- a/src/Umbraco.Web.Common/Mvc/UmbracoMvcConfigureOptions.cs +++ b/src/Umbraco.Web.Common/Mvc/UmbracoMvcConfigureOptions.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -using Umbraco.Web.Common.Filters; -using Umbraco.Web.Common.ModelBinders; +using Umbraco.Cms.Web.Common.Filters; +using Umbraco.Cms.Web.Common.ModelBinders; -namespace Umbraco.Web.Common.Mvc +namespace Umbraco.Cms.Web.Common.Mvc { /// diff --git a/src/Umbraco.Web.Common/Plugins/UmbracoPluginPhysicalFileProvider.cs b/src/Umbraco.Web.Common/Plugins/UmbracoPluginPhysicalFileProvider.cs index 76cac70a0c..4259413d2d 100644 --- a/src/Umbraco.Web.Common/Plugins/UmbracoPluginPhysicalFileProvider.cs +++ b/src/Umbraco.Web.Common/Plugins/UmbracoPluginPhysicalFileProvider.cs @@ -7,7 +7,7 @@ using Microsoft.Extensions.FileProviders.Physical; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; -namespace Umbraco.Web.Common.Plugins +namespace Umbraco.Cms.Web.Common.Plugins { /// /// Looks up files using the on-disk file system and check file extensions are on a allow list diff --git a/src/Umbraco.Web.Common/Profiler/InitializeWebProfiling.cs b/src/Umbraco.Web.Common/Profiler/InitializeWebProfiling.cs index bc271f546a..257fd948a1 100644 --- a/src/Umbraco.Web.Common/Profiler/InitializeWebProfiling.cs +++ b/src/Umbraco.Web.Common/Profiler/InitializeWebProfiling.cs @@ -4,10 +4,8 @@ using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Logging; -using Umbraco.Core.Events; -using Umbraco.Core.Logging; -namespace Umbraco.Web.Common.Profiler +namespace Umbraco.Cms.Web.Common.Profiler { /// /// Initialized the web profiling. Ensures the boot process profiling is stopped. diff --git a/src/Umbraco.Web.Common/Profiler/WebProfiler.cs b/src/Umbraco.Web.Common/Profiler/WebProfiler.cs index c0a9366497..34326083d3 100644 --- a/src/Umbraco.Web.Common/Profiler/WebProfiler.cs +++ b/src/Umbraco.Web.Common/Profiler/WebProfiler.cs @@ -4,10 +4,9 @@ using System.Threading; using Microsoft.AspNetCore.Http; using StackExchange.Profiling; using Umbraco.Cms.Core.Logging; -using Umbraco.Core.Logging; using Umbraco.Extensions; -namespace Umbraco.Web.Common.Profiler +namespace Umbraco.Cms.Web.Common.Profiler { public class WebProfiler : IProfiler diff --git a/src/Umbraco.Web.Common/Profiler/WebProfilerHtml.cs b/src/Umbraco.Web.Common/Profiler/WebProfilerHtml.cs index f11c8a486a..037e5e40ad 100644 --- a/src/Umbraco.Web.Common/Profiler/WebProfilerHtml.cs +++ b/src/Umbraco.Web.Common/Profiler/WebProfilerHtml.cs @@ -4,9 +4,8 @@ using Microsoft.AspNetCore.Http; using StackExchange.Profiling; using StackExchange.Profiling.Internal; using Umbraco.Cms.Core.Logging; -using Umbraco.Core.Logging; -namespace Umbraco.Web.Common.Profiler +namespace Umbraco.Cms.Web.Common.Profiler { public class WebProfilerHtml : IProfilerHtml { diff --git a/src/Umbraco.Web.Common/PublishedModels/DummyClassSoThatPublishedModelsNamespaceExists.cs b/src/Umbraco.Web.Common/PublishedModels/DummyClassSoThatPublishedModelsNamespaceExists.cs index 9691cb5a94..df1be4a6f1 100644 --- a/src/Umbraco.Web.Common/PublishedModels/DummyClassSoThatPublishedModelsNamespaceExists.cs +++ b/src/Umbraco.Web.Common/PublishedModels/DummyClassSoThatPublishedModelsNamespaceExists.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Web.PublishedModels +namespace Umbraco.Cms.Web.Common.PublishedModels { // this is here so that Umbraco.Web.PublishedModels namespace exists in views // even if people are not using models at all - because we are referencing it diff --git a/src/Umbraco.Web.Common/Routing/IAreaRoutes.cs b/src/Umbraco.Web.Common/Routing/IAreaRoutes.cs index b01f703016..a82e81f34f 100644 --- a/src/Umbraco.Web.Common/Routing/IAreaRoutes.cs +++ b/src/Umbraco.Web.Common/Routing/IAreaRoutes.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Routing; -namespace Umbraco.Web.Common.Routing +namespace Umbraco.Cms.Web.Common.Routing { /// /// Used to create routes for a route area diff --git a/src/Umbraco.Web.Common/Routing/IRoutableDocumentFilter.cs b/src/Umbraco.Web.Common/Routing/IRoutableDocumentFilter.cs index b921918bf6..62b52191e8 100644 --- a/src/Umbraco.Web.Common/Routing/IRoutableDocumentFilter.cs +++ b/src/Umbraco.Web.Common/Routing/IRoutableDocumentFilter.cs @@ -1,7 +1,7 @@ -namespace Umbraco.Web.Common.Routing +namespace Umbraco.Cms.Web.Common.Routing { public interface IRoutableDocumentFilter { bool IsDocumentRequest(string absPath); } -} \ No newline at end of file +} diff --git a/src/Umbraco.Web.Common/Routing/PublicAccessChecker.cs b/src/Umbraco.Web.Common/Routing/PublicAccessChecker.cs index ba686186c9..0ac3125d87 100644 --- a/src/Umbraco.Web.Common/Routing/PublicAccessChecker.cs +++ b/src/Umbraco.Web.Common/Routing/PublicAccessChecker.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Core.Security; -namespace Umbraco.Web.Common.Routing +namespace Umbraco.Cms.Web.Common.Routing { public class PublicAccessChecker : IPublicAccessChecker { diff --git a/src/Umbraco.Web.Common/Routing/RoutableDocumentFilter.cs b/src/Umbraco.Web.Common/Routing/RoutableDocumentFilter.cs index 22384e7f61..33d08ae252 100644 --- a/src/Umbraco.Web.Common/Routing/RoutableDocumentFilter.cs +++ b/src/Umbraco.Web.Common/Routing/RoutableDocumentFilter.cs @@ -11,7 +11,7 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Extensions; -namespace Umbraco.Web.Common.Routing +namespace Umbraco.Cms.Web.Common.Routing { /// /// Utility class used to check if the current request is for a front-end request diff --git a/src/Umbraco.Web.Common/Routing/UmbracoRouteValues.cs b/src/Umbraco.Web.Common/Routing/UmbracoRouteValues.cs index 65783d4e14..64fd998065 100644 --- a/src/Umbraco.Web.Common/Routing/UmbracoRouteValues.cs +++ b/src/Umbraco.Web.Common/Routing/UmbracoRouteValues.cs @@ -1,11 +1,9 @@ using System; using Microsoft.AspNetCore.Mvc.Controllers; using Umbraco.Cms.Core.Routing; -using Umbraco.Extensions; -using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Routing; +using Umbraco.Cms.Web.Common.Controllers; -namespace Umbraco.Web.Common.Routing +namespace Umbraco.Cms.Web.Common.Routing { /// /// Represents the data required to route to a specific controller/action during an Umbraco request diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs index 21cf60f94e..c4869a9cf9 100644 --- a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs +++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs @@ -5,7 +5,7 @@ using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.WebAssets; using Umbraco.Extensions; -namespace Umbraco.Web.Common.RuntimeMinification +namespace Umbraco.Cms.Web.Common.RuntimeMinification { public sealed class SmidgeComposer : IComposer { diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeHelperAccessor.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeHelperAccessor.cs index c46a948bc2..198fe7a5d0 100644 --- a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeHelperAccessor.cs +++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeHelperAccessor.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Smidge; -namespace Umbraco.Web.Common.RuntimeMinification +namespace Umbraco.Cms.Web.Common.RuntimeMinification { // work around for SmidgeHelper being request/scope lifetime public sealed class SmidgeHelperAccessor diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeNuglifyJs.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeNuglifyJs.cs index bab4abde53..cf85ae568d 100644 --- a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeNuglifyJs.cs +++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeNuglifyJs.cs @@ -1,6 +1,6 @@ using Smidge.Nuglify; -namespace Umbraco.Web.Common.RuntimeMinification +namespace Umbraco.Cms.Web.Common.RuntimeMinification { /// /// Custom Nuglify Js pre-process to specify custom nuglify options without changing the global defaults diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs index 635eeb2ad2..f90ef96f19 100644 --- a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs +++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs @@ -10,12 +10,10 @@ using Smidge.Nuglify; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.WebAssets; -using Umbraco.Core; -using Umbraco.Core.Configuration; using CssFile = Smidge.Models.CssFile; using JavaScriptFile = Smidge.Models.JavaScriptFile; -namespace Umbraco.Web.Common.RuntimeMinification +namespace Umbraco.Cms.Web.Common.RuntimeMinification { public class SmidgeRuntimeMinifier : IRuntimeMinifier { diff --git a/src/Umbraco.Web.Common/Security/BackOfficeUserManager.cs b/src/Umbraco.Web.Common/Security/BackOfficeUserManager.cs index be49aefa3e..b8e5cd9c43 100644 --- a/src/Umbraco.Web.Common/Security/BackOfficeUserManager.cs +++ b/src/Umbraco.Web.Common/Security/BackOfficeUserManager.cs @@ -6,18 +6,15 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Net; using Umbraco.Cms.Core.Security; -using Umbraco.Core; using Umbraco.Core.Security; using Umbraco.Extensions; - -namespace Umbraco.Web.Common.Security +namespace Umbraco.Cms.Web.Common.Security { public class BackOfficeUserManager : UmbracoUserManager, IBackOfficeUserManager { diff --git a/src/Umbraco.Web.Common/Security/BackofficeSecurity.cs b/src/Umbraco.Web.Common/Security/BackofficeSecurity.cs index 339f8aec40..27dd822f1a 100644 --- a/src/Umbraco.Web.Common/Security/BackofficeSecurity.cs +++ b/src/Umbraco.Web.Common/Security/BackofficeSecurity.cs @@ -1,16 +1,11 @@ using Microsoft.AspNetCore.Http; using Umbraco.Cms.Core; -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 Umbraco.Extensions; -namespace Umbraco.Web.Common.Security +namespace Umbraco.Cms.Web.Common.Security { // TODO: This is only for the back office, does it need to be in common? diff --git a/src/Umbraco.Web.Common/Security/BackofficeSecurityFactory.cs b/src/Umbraco.Web.Common/Security/BackofficeSecurityFactory.cs index 0ea4781763..41e7f6d816 100644 --- a/src/Umbraco.Web.Common/Security/BackofficeSecurityFactory.cs +++ b/src/Umbraco.Web.Common/Security/BackofficeSecurityFactory.cs @@ -2,11 +2,8 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -namespace Umbraco.Web.Common.Security +namespace Umbraco.Cms.Web.Common.Security { // TODO: This is only for the back office, does it need to be in common? diff --git a/src/Umbraco.Web.Common/Security/EncryptionHelper.cs b/src/Umbraco.Web.Common/Security/EncryptionHelper.cs index b89760ff3f..48154d7c8f 100644 --- a/src/Umbraco.Web.Common/Security/EncryptionHelper.cs +++ b/src/Umbraco.Web.Common/Security/EncryptionHelper.cs @@ -7,10 +7,10 @@ using System.Web; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core; +using Umbraco.Cms.Web.Common.Constants; using Umbraco.Extensions; -using Umbraco.Web.Common.Constants; -namespace Umbraco.Web.Common.Security +namespace Umbraco.Cms.Web.Common.Security { public class EncryptionHelper { diff --git a/src/Umbraco.Web.Common/Templates/TemplateRenderer.cs b/src/Umbraco.Web.Common/Templates/TemplateRenderer.cs index 7459a588c8..5818609aeb 100644 --- a/src/Umbraco.Web.Common/Templates/TemplateRenderer.cs +++ b/src/Umbraco.Web.Common/Templates/TemplateRenderer.cs @@ -13,19 +13,15 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Templates; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Services; using Umbraco.Extensions; -using Umbraco.Web.Routing; -namespace Umbraco.Web.Common.Templates +namespace Umbraco.Cms.Web.Common.Templates { /// /// This is used purely for the RenderTemplate functionality in Umbraco diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index 1d09f5f897..2bcf4a3e55 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -4,6 +4,7 @@ net5.0 Library latest + Umbraco.Cms.Web.Common diff --git a/src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs b/src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs index e36a58c118..c31fe4dd3e 100644 --- a/src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs +++ b/src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs @@ -7,9 +7,8 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Web; using Umbraco.Extensions; -using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web +namespace Umbraco.Cms.Web.Common.UmbracoContext { /// /// Class that encapsulates Umbraco information of a specific HTTP request @@ -146,7 +145,7 @@ namespace Umbraco.Web && _umbracoRequestPaths.IsBackOfficeRequest(requestUrl.AbsolutePath) == false && _backofficeSecurity.CurrentUser != null) { - var previewToken = _cookieManager.GetCookieValue(Constants.Web.PreviewCookieName); // may be null or empty + var previewToken = _cookieManager.GetCookieValue(Core.Constants.Web.PreviewCookieName); // may be null or empty _previewToken = previewToken.IsNullOrWhiteSpace() ? null : previewToken; } diff --git a/src/Umbraco.Web.Common/UmbracoContext/UmbracoContextFactory.cs b/src/Umbraco.Web.Common/UmbracoContext/UmbracoContextFactory.cs index a1998337c3..8d199febd0 100644 --- a/src/Umbraco.Web.Common/UmbracoContext/UmbracoContextFactory.cs +++ b/src/Umbraco.Web.Common/UmbracoContext/UmbracoContextFactory.cs @@ -1,5 +1,4 @@ using System; -using Microsoft.Extensions.Options; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Models.PublishedContent; @@ -7,10 +6,8 @@ using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Web; -using Umbraco.Core.Security; -using Umbraco.Web.PublishedCache; -namespace Umbraco.Web +namespace Umbraco.Cms.Web.Common.UmbracoContext { /// /// Creates and manages instances. diff --git a/src/Umbraco.Web.Common/UmbracoHelper.cs b/src/Umbraco.Web.Common/UmbracoHelper.cs index df131246b3..4ed59a00e0 100644 --- a/src/Umbraco.Web.Common/UmbracoHelper.cs +++ b/src/Umbraco.Web.Common/UmbracoHelper.cs @@ -9,8 +9,9 @@ using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Templates; using Umbraco.Cms.Core.Xml; using Umbraco.Extensions; +using Umbraco.Web; -namespace Umbraco.Web.Website +namespace Umbraco.Cms.Web.Common { /// /// A helper class that provides many useful methods and functionality for using Umbraco in templates diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs index 0f4ccd09fb..39ce6785df 100644 --- a/src/Umbraco.Web.UI.NetCore/Startup.cs +++ b/src/Umbraco.Web.UI.NetCore/Startup.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Extensions; -using Umbraco.Web.Common.DependencyInjection; using Umbraco.Web.Website.DependencyInjection; namespace Umbraco.Web.UI.NetCore diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml index b06f1fe953..b9207ece9b 100644 --- a/src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml +++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml @@ -1,4 +1,4 @@ -@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage +@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage @{ if (!Model.Any()) { return; } } diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml index 30f55f2058..cc9bb2bb06 100644 --- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml +++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml @@ -1,7 +1,7 @@ @using System.Web @using Microsoft.AspNetCore.Html @using Newtonsoft.Json.Linq -@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage +@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage @* Razor helpers located at the bottom of this file diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml index 68ded16619..d6728a5019 100644 --- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml +++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml @@ -1,7 +1,7 @@ @using System.Web @using Microsoft.AspNetCore.Html @using Newtonsoft.Json.Linq -@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage +@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage @if (Model != null && Model.sections != null) { diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml index a48081fba2..c28b375fc8 100644 --- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml +++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml @@ -1,6 +1,6 @@ @using Umbraco.Core @using Umbraco.Cms.Core -@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage +@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage @{ string embedValue = Convert.ToString(Model.value); diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml index 87f6ec04af..59416a4ea5 100644 --- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml +++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml @@ -1,4 +1,4 @@ -@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage +@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage @if (Model.value != null) { diff --git a/src/Umbraco.Web.UI.NetCore/Views/_ViewImports.cshtml b/src/Umbraco.Web.UI.NetCore/Views/_ViewImports.cshtml index 7770ecdc5f..ea2ad886bc 100644 --- a/src/Umbraco.Web.UI.NetCore/Views/_ViewImports.cshtml +++ b/src/Umbraco.Web.UI.NetCore/Views/_ViewImports.cshtml @@ -1,4 +1,3 @@ @using Umbraco.Extensions @using Umbraco.Web.UI.NetCore -@using Umbraco.Web.PublishedModels @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml index 585206c015..30c3feb5c5 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml @@ -1,6 +1,6 @@ @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedUrlProvider PublishedUrlProvider @* This snippet makes a breadcrumb of parents using an unordered HTML list. diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/EditProfile.cshtml index c7aec7d534..3c22f5e702 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/EditProfile.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/EditProfile.cshtml @@ -2,7 +2,7 @@ @using Umbraco.Core.Security @using Umbraco.Extensions @using Umbraco.Web.Website.Controllers -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IUmbracoWebsiteSecurityAccessor UmbracoWebsiteSecurityAccessor @{ diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Empty.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Empty.cshtml index 8c983c4da4..01501b67a8 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Empty.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Empty.cshtml @@ -1 +1 @@ -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Gallery.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Gallery.cshtml index 2dc6f659d3..d1f109d307 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Gallery.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Gallery.cshtml @@ -3,10 +3,8 @@ @using Umbraco.Cms.Core.Models.PublishedContent @using Umbraco.Cms.Core.Routing @using Umbraco.Web -@using Umbraco.Core @using Umbraco.Extensions -@using Umbraco.Web.Routing -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedValueFallback PublishedValueFallback @inject IPublishedContentQuery PublishedContentQuery @inject IVariationContextAccessor VariationContextAccessor diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml index d46e3e9cef..c44965ec85 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml @@ -1,6 +1,6 @@ @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedUrlProvider PublishedUrlProvider @* This snippet makes a list of links to the of parents of the current page using an unordered HTML list. diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml index 0c331c3884..8ce5fd7920 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml @@ -3,7 +3,7 @@ @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions @using Umbraco.Web -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedContentQuery PublishedContentQuery @inject IPublishedValueFallback PublishedValueFallback @inject IPublishedUrlProvider PublishedUrlProvider diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml index 1d9d45e772..491f90238a 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml @@ -2,7 +2,7 @@ @using Umbraco.Cms.Core.Models.PublishedContent @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedValueFallback PublishedValueFallback @inject IPublishedUrlProvider PublishedUrlProvider @* diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml index dfdf4442f8..b998d917a1 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml @@ -2,7 +2,7 @@ @using Umbraco.Cms.Core.Models.PublishedContent @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedValueFallback PublishedValueFallback @inject IPublishedUrlProvider PublishedUrlProvider @* diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml index c67cf5ceb2..ac66ece1ea 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml @@ -2,7 +2,7 @@ @using Umbraco.Cms.Core.Models.PublishedContent @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedValueFallback PublishedValueFallback @inject IPublishedUrlProvider PublishedUrlProvider @* diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml index 45d0b66b61..f20253bc7f 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml @@ -2,7 +2,7 @@ @using Umbraco.Cms.Core.Models.PublishedContent @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedValueFallback PublishedValueFallback @inject IPublishedUrlProvider PublishedUrlProvider @* diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml index 7aaf1b6e29..1f78ae43a0 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml @@ -2,7 +2,7 @@ @using Umbraco.Cms.Core.Models.PublishedContent @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IVariationContextAccessor VariationContextAccessor @inject IPublishedValueFallback PublishedValueFallback @inject IPublishedUrlProvider PublishedUrlProvider diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml index 3d6e3087b2..92caf9906d 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml @@ -2,7 +2,7 @@ @using Umbraco.Cms.Core.Models.PublishedContent @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedValueFallback PublishedValueFallback @inject IPublishedUrlProvider PublishedUrlProvider @* diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml index 7dbd4d05ef..b837cca787 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml @@ -1,7 +1,7 @@ @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions @using Umbraco.Web -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedContentQuery PublishedContentQuery @inject IPublishedUrlProvider PublishedUrlProvider @* diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Login.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Login.cshtml index ac2fb84762..d044667076 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Login.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Login.cshtml @@ -2,7 +2,7 @@ @using Umbraco.Cms.Core.Models.Security @using Umbraco.Extensions @using Umbraco.Web.Website.Controllers -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @{ var loginModel = new LoginModel(); diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml index d2d5ec4251..d9518e00d3 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml @@ -3,7 +3,7 @@ @using Umbraco.Core.Security @using Umbraco.Extensions @using Umbraco.Web.Website.Controllers -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IUmbracoWebsiteSecurityAccessor UmbracoWebsiteSecurityAccessor @{ diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml index f9516e78ce..43ef1a1e7a 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml @@ -1,7 +1,7 @@ @using Umbraco.Cms.Core.Models.PublishedContent @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedValueFallback PublishedValueFallback @inject IPublishedUrlProvider PublishedUrlProvider @* diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Navigation.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Navigation.cshtml index 99d3b55f9d..6e28bb88dd 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Navigation.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Navigation.cshtml @@ -2,7 +2,7 @@ @using Umbraco.Cms.Core.Models.PublishedContent @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedValueFallback PublishedValueFallback @inject IPublishedUrlProvider PublishedUrlProvider @* diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml index 2d88265dae..3e04f870e6 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml @@ -2,7 +2,7 @@ @using Umbraco.Core.Security @using Umbraco.Extensions @using Umbraco.Web.Website.Controllers -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IUmbracoWebsiteSecurityAccessor UmbracoWebsiteSecurityAccessor @{ diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/SiteMap.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/SiteMap.cshtml index b39e5fb5be..e914a3a027 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/SiteMap.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/SiteMap.cshtml @@ -2,7 +2,7 @@ @using Umbraco.Cms.Core.Models.PublishedContent @using Umbraco.Cms.Core.Routing @using Umbraco.Extensions -@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage +@inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedValueFallback PublishedValueFallback @inject IPublishedUrlProvider PublishedUrlProvider @* diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml index 5cf653a5d9..d2020a9182 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml @@ -8,7 +8,6 @@ @using Umbraco.Cms.Web.BackOffice.Controllers @using Umbraco.Cms.Web.BackOffice.Security @using Umbraco.Web.WebAssets -@using Umbraco.Web.Common.Security @using Umbraco.Extensions @inject IBackOfficeSignInManager SignInManager @inject BackOfficeServerVariables BackOfficeServerVariables diff --git a/src/Umbraco.Web.Website/ActionResults/UmbracoPageResult.cs b/src/Umbraco.Web.Website/ActionResults/UmbracoPageResult.cs index 46fa78f21a..e81ac4231f 100644 --- a/src/Umbraco.Web.Website/ActionResults/UmbracoPageResult.cs +++ b/src/Umbraco.Web.Website/ActionResults/UmbracoPageResult.cs @@ -6,8 +6,8 @@ using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.Extensions.DependencyInjection; using Umbraco.Cms.Core.Logging; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Core.Logging; -using Umbraco.Web.Common.Routing; using Umbraco.Web.Website.Controllers; using Umbraco.Web.Website.Routing; using static Umbraco.Cms.Core.Constants.Web.Routing; diff --git a/src/Umbraco.Web.Website/Controllers/SurfaceController.cs b/src/Umbraco.Web.Website/Controllers/SurfaceController.cs index b6c65008ed..0508f227fc 100644 --- a/src/Umbraco.Web.Website/Controllers/SurfaceController.cs +++ b/src/Umbraco.Web.Website/Controllers/SurfaceController.cs @@ -8,13 +8,13 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; using Umbraco.Core.Services; -using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.Routing; using Umbraco.Web.Routing; using Umbraco.Web.Website.ActionResults; diff --git a/src/Umbraco.Web.Website/Controllers/UmbLoginController.cs b/src/Umbraco.Web.Website/Controllers/UmbLoginController.cs index 1bde6d0bc4..991dcfdb0f 100644 --- a/src/Umbraco.Web.Website/Controllers/UmbLoginController.cs +++ b/src/Umbraco.Web.Website/Controllers/UmbLoginController.cs @@ -8,9 +8,9 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.Common.Filters; using Umbraco.Core.Persistence; using Umbraco.Extensions; -using Umbraco.Web.Common.Filters; namespace Umbraco.Web.Website.Controllers { diff --git a/src/Umbraco.Web.Website/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web.Website/Controllers/UmbLoginStatusController.cs index b425da1d47..58e04e0e5f 100644 --- a/src/Umbraco.Web.Website/Controllers/UmbLoginStatusController.cs +++ b/src/Umbraco.Web.Website/Controllers/UmbLoginStatusController.cs @@ -7,9 +7,9 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.Common.Filters; using Umbraco.Core.Persistence; using Umbraco.Extensions; -using Umbraco.Web.Common.Filters; namespace Umbraco.Web.Website.Controllers { diff --git a/src/Umbraco.Web.Website/Controllers/UmbProfileController.cs b/src/Umbraco.Web.Website/Controllers/UmbProfileController.cs index 2c62cfbb06..87accba97a 100644 --- a/src/Umbraco.Web.Website/Controllers/UmbProfileController.cs +++ b/src/Umbraco.Web.Website/Controllers/UmbProfileController.cs @@ -8,9 +8,9 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.Common.Filters; using Umbraco.Core.Persistence; using Umbraco.Extensions; -using Umbraco.Web.Common.Filters; namespace Umbraco.Web.Website.Controllers { diff --git a/src/Umbraco.Web.Website/Controllers/UmbRegisterController.cs b/src/Umbraco.Web.Website/Controllers/UmbRegisterController.cs index 5593d320fa..256c7e11d4 100644 --- a/src/Umbraco.Web.Website/Controllers/UmbRegisterController.cs +++ b/src/Umbraco.Web.Website/Controllers/UmbRegisterController.cs @@ -8,9 +8,9 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.Common.Filters; using Umbraco.Core.Persistence; using Umbraco.Extensions; -using Umbraco.Web.Common.Filters; namespace Umbraco.Web.Website.Controllers { diff --git a/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaults.cs b/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaults.cs index 65c27a3269..87436e82b7 100644 --- a/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaults.cs +++ b/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaults.cs @@ -1,5 +1,5 @@ using System; -using Umbraco.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Controllers; namespace Umbraco.Web.Website.Controllers { diff --git a/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs index 14ec14d418..b70e5ff9b7 100644 --- a/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs @@ -2,9 +2,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.DependencyInjection; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Extensions; using Umbraco.Infrastructure.DependencyInjection; -using Umbraco.Web.Common.Routing; using Umbraco.Web.Website.Collections; using Umbraco.Web.Website.Controllers; using Umbraco.Web.Website.Routing; diff --git a/src/Umbraco.Web.Website/Extensions/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web.Website/Extensions/HtmlHelperRenderExtensions.cs index bd00727562..11e6dec4de 100644 --- a/src/Umbraco.Web.Website/Extensions/HtmlHelperRenderExtensions.cs +++ b/src/Umbraco.Web.Website/Extensions/HtmlHelperRenderExtensions.cs @@ -21,13 +21,9 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Core.Web.Mvc; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; -using Umbraco.Web; -using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.Mvc; -using Umbraco.Web.Common.Security; +using Umbraco.Cms.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Mvc; +using Umbraco.Cms.Web.Common.Security; using Umbraco.Web.Website.Collections; using Umbraco.Web.Website.Controllers; diff --git a/src/Umbraco.Web.Website/Extensions/LinkGeneratorExtensions.cs b/src/Umbraco.Web.Website/Extensions/LinkGeneratorExtensions.cs index c4c8c18052..61551ed9e7 100644 --- a/src/Umbraco.Web.Website/Extensions/LinkGeneratorExtensions.cs +++ b/src/Umbraco.Web.Website/Extensions/LinkGeneratorExtensions.cs @@ -6,7 +6,6 @@ using System.Linq.Expressions; using System.Reflection; using Microsoft.AspNetCore.Routing; using Umbraco.Cms.Core; -using Umbraco.Core; using Umbraco.Web.Website.Controllers; namespace Umbraco.Extensions diff --git a/src/Umbraco.Web.Website/Extensions/TypeLoaderExtensions.cs b/src/Umbraco.Web.Website/Extensions/TypeLoaderExtensions.cs index 89ade868b0..6278ede35c 100644 --- a/src/Umbraco.Web.Website/Extensions/TypeLoaderExtensions.cs +++ b/src/Umbraco.Web.Website/Extensions/TypeLoaderExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Umbraco.Cms.Core.Composing; -using Umbraco.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Controllers; using Umbraco.Web.Website.Controllers; namespace Umbraco.Extensions diff --git a/src/Umbraco.Web.Website/Routing/ControllerActionSearcher.cs b/src/Umbraco.Web.Website/Routing/ControllerActionSearcher.cs index cf4e68d410..efd34d147d 100644 --- a/src/Umbraco.Web.Website/Routing/ControllerActionSearcher.cs +++ b/src/Umbraco.Web.Website/Routing/ControllerActionSearcher.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Composing; -using Umbraco.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Controllers; using static Umbraco.Cms.Core.Constants.Web.Routing; namespace Umbraco.Web.Website.Routing diff --git a/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs b/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs index dac8f39dea..1fad29f34e 100644 --- a/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs +++ b/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs @@ -2,14 +2,13 @@ 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.Common.Controllers; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Extensions; -using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.Routing; using Umbraco.Web.Website.Collections; namespace Umbraco.Web.Website.Routing diff --git a/src/Umbraco.Web.Website/Routing/IUmbracoRouteValuesFactory.cs b/src/Umbraco.Web.Website/Routing/IUmbracoRouteValuesFactory.cs index 854299dffd..5f43ce7cc2 100644 --- a/src/Umbraco.Web.Website/Routing/IUmbracoRouteValuesFactory.cs +++ b/src/Umbraco.Web.Website/Routing/IUmbracoRouteValuesFactory.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Routing; using Umbraco.Cms.Core.Routing; -using Umbraco.Web.Common.Routing; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Web.Routing; namespace Umbraco.Web.Website.Routing diff --git a/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs b/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs index f319a94728..4cce57518f 100644 --- a/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs +++ b/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs @@ -18,11 +18,9 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; -using Umbraco.Core; +using Umbraco.Cms.Web.Common.Routing; +using Umbraco.Cms.Web.Common.Security; using Umbraco.Extensions; -using Umbraco.Web.Common.Routing; -using Umbraco.Web.Common.Security; -using Umbraco.Web.Routing; using Umbraco.Web.Website.Controllers; using static Umbraco.Cms.Core.Constants.Web.Routing; using RouteDirection = Umbraco.Cms.Core.Routing.RouteDirection; diff --git a/src/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactory.cs b/src/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactory.cs index 2b84e7a4d8..28f545fcd7 100644 --- a/src/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactory.cs +++ b/src/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactory.cs @@ -7,16 +7,13 @@ using Umbraco.Cms.Core.Features; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; +using Umbraco.Cms.Web.Common.Controllers; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Extensions; -using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.Routing; -using Umbraco.Web.Routing; using Umbraco.Web.Website.Controllers; namespace Umbraco.Web.Website.Routing { - /// /// Used to create ///