diff --git a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs index 6d5dd84798..27252c45f8 100644 --- a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs +++ b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs @@ -21,12 +21,11 @@ using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Cms.Web.Common.Controllers; +using Umbraco.Cms.Web.Website.Controllers; using Umbraco.Extensions; using Umbraco.Tests.Integration.DependencyInjection; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; -using Umbraco.Web.Website.Controllers; -using Umbraco.Web.Website.DependencyInjection; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.Integration.TestServerTest diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs index a49f13c6b3..0bf2689a8a 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs @@ -14,6 +14,7 @@ using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.Website.Controllers; using Umbraco.Core.Cache; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; @@ -21,7 +22,6 @@ using Umbraco.Core.Services; using Umbraco.Tests.Integration.TestServerTest; using Umbraco.Web; using Umbraco.Web.Routing; -using Umbraco.Web.Website.Controllers; namespace Umbraco.Tests.Integration.Umbraco.Web.Website.Routing { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs index e4ed10df0c..9bac053e74 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs @@ -8,10 +8,10 @@ using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.Website.Controllers; +using Umbraco.Cms.Web.Website.Models; using Umbraco.Tests.Common; using Umbraco.Web; -using Umbraco.Web.Website.Controllers; -using Umbraco.Web.Website.Models; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Controllers { 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 9bda656a4c..8a5a93e3b0 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs @@ -19,6 +19,7 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Web.Common.Routing; +using Umbraco.Cms.Web.Website.Controllers; using Umbraco.Core.Cache; using Umbraco.Core.Security; using Umbraco.Core.Services; @@ -28,7 +29,6 @@ using Umbraco.Tests.UnitTests.TestHelpers.Objects; using Umbraco.Web; using Umbraco.Web.PublishedCache; using Umbraco.Web.Routing; -using Umbraco.Web.Website.Controllers; using CoreConstants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.UnitTests.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 ae8b450dc9..1bba6de689 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs @@ -13,8 +13,8 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Web.Common.Controllers; +using Umbraco.Cms.Web.Website.Routing; using Umbraco.Extensions; -using Umbraco.Web.Website.Routing; using static Umbraco.Cms.Core.Constants.Web.Routing; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.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 2cf6035ad8..fe1df1142e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs @@ -19,10 +19,10 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Web.Common.Controllers; using Umbraco.Cms.Web.Common.Routing; +using Umbraco.Cms.Web.Website.Controllers; +using Umbraco.Cms.Web.Website.Routing; using Umbraco.Extensions; using Umbraco.Tests.TestHelpers; -using Umbraco.Web.Website.Controllers; -using Umbraco.Web.Website.Routing; using static Umbraco.Cms.Core.Constants.Web.Routing; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.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 35e8559367..24d63b1074 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs @@ -16,9 +16,9 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Web.Common.Controllers; using Umbraco.Cms.Web.Common.Routing; +using Umbraco.Cms.Web.Website.Controllers; +using Umbraco.Cms.Web.Website.Routing; using Umbraco.Extensions; -using Umbraco.Web.Website.Controllers; -using Umbraco.Web.Website.Routing; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Routing { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Security/UmbracoWebsiteSecurityTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Security/UmbracoWebsiteSecurityTests.cs index b9725d074b..46b31e5770 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Security/UmbracoWebsiteSecurityTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Security/UmbracoWebsiteSecurityTests.cs @@ -12,11 +12,11 @@ using Umbraco.Cms.Core.Models.Security; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Web.Website.Security; using Umbraco.Core.Models; using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Tests.Common.Builders; -using Umbraco.Web.Website.Security; using CoreConstants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Security diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs index 39ce6785df..5d72fa3948 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.Website.DependencyInjection; namespace Umbraco.Web.UI.NetCore { 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 3c22f5e702..e88794bcb5 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/EditProfile.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/EditProfile.cshtml @@ -1,7 +1,6 @@ @using Umbraco.Cms.Core.Security -@using Umbraco.Core.Security +@using Umbraco.Cms.Web.Website.Controllers @using Umbraco.Extensions -@using Umbraco.Web.Website.Controllers @inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IUmbracoWebsiteSecurityAccessor UmbracoWebsiteSecurityAccessor 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 d044667076..404f2a155e 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Login.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Login.cshtml @@ -1,7 +1,7 @@ @using Microsoft.AspNetCore.Http.Extensions @using Umbraco.Cms.Core.Models.Security +@using Umbraco.Cms.Web.Website.Controllers @using Umbraco.Extensions -@using Umbraco.Web.Website.Controllers @inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @{ 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 d9518e00d3..cd64033b48 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml @@ -1,8 +1,7 @@ @using Umbraco.Cms.Core.Models.Security @using Umbraco.Cms.Core.Security -@using Umbraco.Core.Security +@using Umbraco.Cms.Web.Website.Controllers @using Umbraco.Extensions -@using Umbraco.Web.Website.Controllers @inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IUmbracoWebsiteSecurityAccessor UmbracoWebsiteSecurityAccessor 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 3e04f870e6..2c860ca435 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml @@ -1,7 +1,6 @@ @using Umbraco.Cms.Core.Security -@using Umbraco.Core.Security +@using Umbraco.Cms.Web.Website.Controllers @using Umbraco.Extensions -@using Umbraco.Web.Website.Controllers @inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IUmbracoWebsiteSecurityAccessor UmbracoWebsiteSecurityAccessor diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoWebsite/NoNodes.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoWebsite/NoNodes.cshtml index 2d397b0fbb..d790fd4bf7 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoWebsite/NoNodes.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoWebsite/NoNodes.cshtml @@ -1,4 +1,4 @@ -@model Umbraco.Web.Website.Models.NoNodesViewModel +@model Umbraco.Cms.Web.Website.Models.NoNodesViewModel diff --git a/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoPageResult.cs b/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoPageResult.cs index 198a882ed9..62d0dc7a10 100644 --- a/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoPageResult.cs +++ b/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoPageResult.cs @@ -10,7 +10,7 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Web; using Umbraco.Extensions; -namespace Umbraco.Web.Website.ActionResults +namespace Umbraco.Cms.Web.Website.ActionResults { /// /// Redirects to an Umbraco page by Id or Entity diff --git a/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoUrlResult.cs b/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoUrlResult.cs index 2277802818..4857c9c9a1 100644 --- a/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoUrlResult.cs +++ b/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoUrlResult.cs @@ -2,10 +2,9 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.Extensions.DependencyInjection; using Umbraco.Cms.Core.Web; -namespace Umbraco.Web.Website.ActionResults +namespace Umbraco.Cms.Web.Website.ActionResults { /// /// Redirects to the current URL rendering an Umbraco page including it's query strings diff --git a/src/Umbraco.Web.Website/ActionResults/UmbracoPageResult.cs b/src/Umbraco.Web.Website/ActionResults/UmbracoPageResult.cs index e81ac4231f..8c98a177bc 100644 --- a/src/Umbraco.Web.Website/ActionResults/UmbracoPageResult.cs +++ b/src/Umbraco.Web.Website/ActionResults/UmbracoPageResult.cs @@ -7,12 +7,10 @@ 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.Website.Controllers; -using Umbraco.Web.Website.Routing; +using Umbraco.Cms.Web.Website.Controllers; using static Umbraco.Cms.Core.Constants.Web.Routing; -namespace Umbraco.Web.Website.ActionResults +namespace Umbraco.Cms.Web.Website.ActionResults { /// /// Used by posted forms to proxy the result to the page in which the current URL matches on diff --git a/src/Umbraco.Web.Website/Collections/SurfaceControllerTypeCollection.cs b/src/Umbraco.Web.Website/Collections/SurfaceControllerTypeCollection.cs index 4edbc29b01..e77b11a3d8 100644 --- a/src/Umbraco.Web.Website/Collections/SurfaceControllerTypeCollection.cs +++ b/src/Umbraco.Web.Website/Collections/SurfaceControllerTypeCollection.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Umbraco.Cms.Core.Composing; -namespace Umbraco.Web.Website.Collections +namespace Umbraco.Cms.Web.Website.Collections { public class SurfaceControllerTypeCollection : BuilderCollectionBase { diff --git a/src/Umbraco.Web.Website/Collections/SurfaceControllerTypeCollectionBuilder.cs b/src/Umbraco.Web.Website/Collections/SurfaceControllerTypeCollectionBuilder.cs index 55bb9289e1..17fea9077b 100644 --- a/src/Umbraco.Web.Website/Collections/SurfaceControllerTypeCollectionBuilder.cs +++ b/src/Umbraco.Web.Website/Collections/SurfaceControllerTypeCollectionBuilder.cs @@ -1,7 +1,7 @@ using Umbraco.Cms.Core.Composing; -using Umbraco.Web.Website.Controllers; +using Umbraco.Cms.Web.Website.Controllers; -namespace Umbraco.Web.Website.Collections +namespace Umbraco.Cms.Web.Website.Collections { public class SurfaceControllerTypeCollectionBuilder : TypeCollectionBuilderBase { diff --git a/src/Umbraco.Web.Website/Controllers/IUmbracoRenderingDefaults.cs b/src/Umbraco.Web.Website/Controllers/IUmbracoRenderingDefaults.cs index 507b8c4a04..6f4fdb0cb2 100644 --- a/src/Umbraco.Web.Website/Controllers/IUmbracoRenderingDefaults.cs +++ b/src/Umbraco.Web.Website/Controllers/IUmbracoRenderingDefaults.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Web.Website.Controllers +namespace Umbraco.Cms.Web.Website.Controllers { /// /// The defaults used for rendering Umbraco front-end pages diff --git a/src/Umbraco.Web.Website/Controllers/RenderNoContentController.cs b/src/Umbraco.Web.Website/Controllers/RenderNoContentController.cs index 9c3c58d28f..2546531735 100644 --- a/src/Umbraco.Web.Website/Controllers/RenderNoContentController.cs +++ b/src/Umbraco.Web.Website/Controllers/RenderNoContentController.cs @@ -4,9 +4,9 @@ using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Web; -using Umbraco.Web.Website.Models; +using Umbraco.Cms.Web.Website.Models; -namespace Umbraco.Web.Website.Controllers +namespace Umbraco.Cms.Web.Website.Controllers { public class RenderNoContentController : Controller { diff --git a/src/Umbraco.Web.Website/Controllers/SurfaceController.cs b/src/Umbraco.Web.Website/Controllers/SurfaceController.cs index 0508f227fc..e8d7523adb 100644 --- a/src/Umbraco.Web.Website/Controllers/SurfaceController.cs +++ b/src/Umbraco.Web.Website/Controllers/SurfaceController.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Specialized; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Cache; @@ -10,15 +9,10 @@ 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.Cms.Web.Website.ActionResults; using Umbraco.Core.Persistence; -using Umbraco.Core.Services; -using Umbraco.Web.Routing; -using Umbraco.Web.Website.ActionResults; -namespace Umbraco.Web.Website.Controllers +namespace Umbraco.Cms.Web.Website.Controllers { /// /// Provides a base class for front-end add-in controllers. diff --git a/src/Umbraco.Web.Website/Controllers/UmbLoginController.cs b/src/Umbraco.Web.Website/Controllers/UmbLoginController.cs index 991dcfdb0f..a8b486c58c 100644 --- a/src/Umbraco.Web.Website/Controllers/UmbLoginController.cs +++ b/src/Umbraco.Web.Website/Controllers/UmbLoginController.cs @@ -1,6 +1,5 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Models.Security; @@ -12,7 +11,7 @@ using Umbraco.Cms.Web.Common.Filters; using Umbraco.Core.Persistence; using Umbraco.Extensions; -namespace Umbraco.Web.Website.Controllers +namespace Umbraco.Cms.Web.Website.Controllers { public class UmbLoginController : SurfaceController { diff --git a/src/Umbraco.Web.Website/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web.Website/Controllers/UmbLoginStatusController.cs index 58e04e0e5f..ffd681d65b 100644 --- a/src/Umbraco.Web.Website/Controllers/UmbLoginStatusController.cs +++ b/src/Umbraco.Web.Website/Controllers/UmbLoginStatusController.cs @@ -11,7 +11,7 @@ using Umbraco.Cms.Web.Common.Filters; using Umbraco.Core.Persistence; using Umbraco.Extensions; -namespace Umbraco.Web.Website.Controllers +namespace Umbraco.Cms.Web.Website.Controllers { [UmbracoMemberAuthorize] public class UmbLoginStatusController : SurfaceController diff --git a/src/Umbraco.Web.Website/Controllers/UmbProfileController.cs b/src/Umbraco.Web.Website/Controllers/UmbProfileController.cs index 87accba97a..72fb09b0eb 100644 --- a/src/Umbraco.Web.Website/Controllers/UmbProfileController.cs +++ b/src/Umbraco.Web.Website/Controllers/UmbProfileController.cs @@ -12,7 +12,7 @@ using Umbraco.Cms.Web.Common.Filters; using Umbraco.Core.Persistence; using Umbraco.Extensions; -namespace Umbraco.Web.Website.Controllers +namespace Umbraco.Cms.Web.Website.Controllers { [UmbracoMemberAuthorize] public class UmbProfileController : SurfaceController diff --git a/src/Umbraco.Web.Website/Controllers/UmbRegisterController.cs b/src/Umbraco.Web.Website/Controllers/UmbRegisterController.cs index 256c7e11d4..0875d38227 100644 --- a/src/Umbraco.Web.Website/Controllers/UmbRegisterController.cs +++ b/src/Umbraco.Web.Website/Controllers/UmbRegisterController.cs @@ -12,7 +12,7 @@ using Umbraco.Cms.Web.Common.Filters; using Umbraco.Core.Persistence; using Umbraco.Extensions; -namespace Umbraco.Web.Website.Controllers +namespace Umbraco.Cms.Web.Website.Controllers { public class UmbRegisterController : SurfaceController { diff --git a/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaults.cs b/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaults.cs index 87436e82b7..095f57b631 100644 --- a/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaults.cs +++ b/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaults.cs @@ -1,7 +1,7 @@ using System; using Umbraco.Cms.Web.Common.Controllers; -namespace Umbraco.Web.Website.Controllers +namespace Umbraco.Cms.Web.Website.Controllers { /// /// The defaults used for rendering Umbraco front-end pages diff --git a/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs index b70e5ff9b7..a19800516f 100644 --- a/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs @@ -3,14 +3,13 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Web.Common.Routing; -using Umbraco.Extensions; +using Umbraco.Cms.Web.Website.Collections; +using Umbraco.Cms.Web.Website.Controllers; +using Umbraco.Cms.Web.Website.Routing; +using Umbraco.Cms.Web.Website.ViewEngines; using Umbraco.Infrastructure.DependencyInjection; -using Umbraco.Web.Website.Collections; -using Umbraco.Web.Website.Controllers; -using Umbraco.Web.Website.Routing; -using Umbraco.Web.Website.ViewEngines; -namespace Umbraco.Web.Website.DependencyInjection +namespace Umbraco.Extensions { /// /// extensions for umbraco front-end website diff --git a/src/Umbraco.Web.Website/Extensions/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web.Website/Extensions/HtmlHelperRenderExtensions.cs index 11e6dec4de..1502a51665 100644 --- a/src/Umbraco.Web.Website/Extensions/HtmlHelperRenderExtensions.cs +++ b/src/Umbraco.Web.Website/Extensions/HtmlHelperRenderExtensions.cs @@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; @@ -24,8 +23,8 @@ using Umbraco.Cms.Core.Web.Mvc; 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; +using Umbraco.Cms.Web.Website.Collections; +using Umbraco.Cms.Web.Website.Controllers; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.Website/Extensions/LinkGeneratorExtensions.cs b/src/Umbraco.Web.Website/Extensions/LinkGeneratorExtensions.cs index 61551ed9e7..217dbbf144 100644 --- a/src/Umbraco.Web.Website/Extensions/LinkGeneratorExtensions.cs +++ b/src/Umbraco.Web.Website/Extensions/LinkGeneratorExtensions.cs @@ -1,12 +1,11 @@ using System; using System.Collections.Generic; -using System.Dynamic; using System.Linq; using System.Linq.Expressions; using System.Reflection; using Microsoft.AspNetCore.Routing; using Umbraco.Cms.Core; -using Umbraco.Web.Website.Controllers; +using Umbraco.Cms.Web.Website.Controllers; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs b/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs index b68d08db05..20b21308d4 100644 --- a/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs +++ b/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs @@ -8,10 +8,10 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; using Umbraco.Examine; -using Umbraco.Extensions; +using Umbraco.Web; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.Website.Extensions +namespace Umbraco.Extensions { public static class PublishedContentExtensions { @@ -101,8 +101,6 @@ namespace Umbraco.Web.Website.Extensions #region IsSomething: equality - public static bool IsEqual(this IPublishedContent content, IPublishedContent other) => content.Id == other.Id; - /// /// If the specified is equal to , the HTML encoded will be returned; otherwise, . /// @@ -126,16 +124,6 @@ namespace Umbraco.Web.Website.Extensions /// public static IHtmlContent IsEqual(this IPublishedContent content, IPublishedContent other, string valueIfTrue, string valueIfFalse) => new HtmlString(HttpUtility.HtmlEncode(content.IsEqual(other) ? valueIfTrue : valueIfFalse)); - /// - /// If the specified is not equal to , true will be returned; otherwise, the result will be false />. - /// - /// The content. - /// The other content. - /// - /// The result from checking whether the two published content items are not equal. - /// - public static bool IsNotEqual(this IPublishedContent content, IPublishedContent other) => content.IsEqual(other) == false; - /// /// If the specified is not equal to , the HTML encoded will be returned; otherwise, . /// diff --git a/src/Umbraco.Web.Website/Extensions/TypeLoaderExtensions.cs b/src/Umbraco.Web.Website/Extensions/TypeLoaderExtensions.cs index 6278ede35c..1964b1c560 100644 --- a/src/Umbraco.Web.Website/Extensions/TypeLoaderExtensions.cs +++ b/src/Umbraco.Web.Website/Extensions/TypeLoaderExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Web.Common.Controllers; -using Umbraco.Web.Website.Controllers; +using Umbraco.Cms.Web.Website.Controllers; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.Website/Extensions/UmbracoWebsiteApplicationBuilderExtensions.cs b/src/Umbraco.Web.Website/Extensions/UmbracoWebsiteApplicationBuilderExtensions.cs index af7041011c..4f049abdac 100644 --- a/src/Umbraco.Web.Website/Extensions/UmbracoWebsiteApplicationBuilderExtensions.cs +++ b/src/Umbraco.Web.Website/Extensions/UmbracoWebsiteApplicationBuilderExtensions.cs @@ -1,7 +1,7 @@ using System; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; -using Umbraco.Web.Website.Routing; +using Umbraco.Cms.Web.Website.Routing; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.Website/Models/NoNodesViewModel.cs b/src/Umbraco.Web.Website/Models/NoNodesViewModel.cs index 2a0be7dd2c..30d3138d84 100644 --- a/src/Umbraco.Web.Website/Models/NoNodesViewModel.cs +++ b/src/Umbraco.Web.Website/Models/NoNodesViewModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Web.Website.Models +namespace Umbraco.Cms.Web.Website.Models { public class NoNodesViewModel { diff --git a/src/Umbraco.Web.Website/Routing/ControllerActionSearcher.cs b/src/Umbraco.Web.Website/Routing/ControllerActionSearcher.cs index efd34d147d..5c758a948c 100644 --- a/src/Umbraco.Web.Website/Routing/ControllerActionSearcher.cs +++ b/src/Umbraco.Web.Website/Routing/ControllerActionSearcher.cs @@ -9,7 +9,7 @@ using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Web.Common.Controllers; using static Umbraco.Cms.Core.Constants.Web.Routing; -namespace Umbraco.Web.Website.Routing +namespace Umbraco.Cms.Web.Website.Routing { /// /// Used to find a controller/action in the current available routes diff --git a/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs b/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs index 1fad29f34e..8f7fad9864 100644 --- a/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs +++ b/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs @@ -8,10 +8,10 @@ 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.Cms.Web.Website.Collections; using Umbraco.Extensions; -using Umbraco.Web.Website.Collections; -namespace Umbraco.Web.Website.Routing +namespace Umbraco.Cms.Web.Website.Routing { /// /// Creates routes for surface controllers diff --git a/src/Umbraco.Web.Website/Routing/IControllerActionSearcher.cs b/src/Umbraco.Web.Website/Routing/IControllerActionSearcher.cs index 6236a2b8f0..b272b4afd3 100644 --- a/src/Umbraco.Web.Website/Routing/IControllerActionSearcher.cs +++ b/src/Umbraco.Web.Website/Routing/IControllerActionSearcher.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Controllers; -namespace Umbraco.Web.Website.Routing +namespace Umbraco.Cms.Web.Website.Routing { public interface IControllerActionSearcher { diff --git a/src/Umbraco.Web.Website/Routing/IUmbracoRouteValuesFactory.cs b/src/Umbraco.Web.Website/Routing/IUmbracoRouteValuesFactory.cs index 5f43ce7cc2..7e30773bf5 100644 --- a/src/Umbraco.Web.Website/Routing/IUmbracoRouteValuesFactory.cs +++ b/src/Umbraco.Web.Website/Routing/IUmbracoRouteValuesFactory.cs @@ -1,10 +1,8 @@ using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Routing; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Web.Common.Routing; -using Umbraco.Web.Routing; -namespace Umbraco.Web.Website.Routing +namespace Umbraco.Cms.Web.Website.Routing { /// /// Used to create diff --git a/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs b/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs index 4cce57518f..d0e5d4c72a 100644 --- a/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs +++ b/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Linq; using System.Net; -using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Http; @@ -20,12 +19,12 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Web.Common.Routing; using Umbraco.Cms.Web.Common.Security; +using Umbraco.Cms.Web.Website.Controllers; using Umbraco.Extensions; -using Umbraco.Web.Website.Controllers; using static Umbraco.Cms.Core.Constants.Web.Routing; using RouteDirection = Umbraco.Cms.Core.Routing.RouteDirection; -namespace Umbraco.Web.Website.Routing +namespace Umbraco.Cms.Web.Website.Routing { /// /// The route value transformer for Umbraco front-end routes diff --git a/src/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactory.cs b/src/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactory.cs index 28f545fcd7..e217ea2777 100644 --- a/src/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactory.cs +++ b/src/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactory.cs @@ -1,18 +1,16 @@ using System; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Controllers; -using Microsoft.AspNetCore.Routing; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Features; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Web.Common.Controllers; using Umbraco.Cms.Web.Common.Routing; +using Umbraco.Cms.Web.Website.Controllers; using Umbraco.Extensions; -using Umbraco.Web.Website.Controllers; -namespace Umbraco.Web.Website.Routing +namespace Umbraco.Cms.Web.Website.Routing { /// /// Used to create diff --git a/src/Umbraco.Web.Website/Security/UmbracoWebsiteSecurity.cs b/src/Umbraco.Web.Website/Security/UmbracoWebsiteSecurity.cs index b69875a749..c878730d90 100644 --- a/src/Umbraco.Web.Website/Security/UmbracoWebsiteSecurity.cs +++ b/src/Umbraco.Web.Website/Security/UmbracoWebsiteSecurity.cs @@ -11,14 +11,9 @@ using Umbraco.Cms.Core.Models.Security; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -using Umbraco.Web.Models; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Web.Website.Security +namespace Umbraco.Cms.Web.Website.Security { public class UmbracoWebsiteSecurity : IUmbracoWebsiteSecurity { diff --git a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj index 2ff13dec89..c3b5a6b1c4 100644 --- a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj +++ b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj @@ -4,6 +4,7 @@ net5.0 Library latest + Umbraco.Cms.Web.Website diff --git a/src/Umbraco.Web.Website/ViewEngines/PluginRazorViewEngineOptionsSetup.cs b/src/Umbraco.Web.Website/ViewEngines/PluginRazorViewEngineOptionsSetup.cs index 6efe914f54..fbf2a34023 100644 --- a/src/Umbraco.Web.Website/ViewEngines/PluginRazorViewEngineOptionsSetup.cs +++ b/src/Umbraco.Web.Website/ViewEngines/PluginRazorViewEngineOptionsSetup.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc.Razor; using Microsoft.Extensions.Options; using Umbraco.Cms.Core; -namespace Umbraco.Web.Website.ViewEngines +namespace Umbraco.Cms.Web.Website.ViewEngines { /// /// Configure view engine locations for front-end rendering based on App_Plugins views diff --git a/src/Umbraco.Web.Website/ViewEngines/ProfilingViewEngine.cs b/src/Umbraco.Web.Website/ViewEngines/ProfilingViewEngine.cs index 49c2dd26ec..abc46aacf1 100644 --- a/src/Umbraco.Web.Website/ViewEngines/ProfilingViewEngine.cs +++ b/src/Umbraco.Web.Website/ViewEngines/ProfilingViewEngine.cs @@ -1,10 +1,8 @@ - -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ViewEngines; using Umbraco.Cms.Core.Logging; -using Umbraco.Core.Logging; -namespace Umbraco.Web.Website.ViewEngines +namespace Umbraco.Cms.Web.Website.ViewEngines { public class ProfilingViewEngine: IViewEngine { diff --git a/src/Umbraco.Web.Website/ViewEngines/ProfilingViewEngineWrapperMvcViewOptionsSetup.cs b/src/Umbraco.Web.Website/ViewEngines/ProfilingViewEngineWrapperMvcViewOptionsSetup.cs index 6ea8be1095..673b88208c 100644 --- a/src/Umbraco.Web.Website/ViewEngines/ProfilingViewEngineWrapperMvcViewOptionsSetup.cs +++ b/src/Umbraco.Web.Website/ViewEngines/ProfilingViewEngineWrapperMvcViewOptionsSetup.cs @@ -5,9 +5,8 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Logging; -using Umbraco.Core.Logging; -namespace Umbraco.Web.Website.ViewEngines +namespace Umbraco.Cms.Web.Website.ViewEngines { /// /// Wraps all view engines with a diff --git a/src/Umbraco.Web.Website/ViewEngines/RenderRazorViewEngineOptionsSetup.cs b/src/Umbraco.Web.Website/ViewEngines/RenderRazorViewEngineOptionsSetup.cs index 39009d44a1..602920dc11 100644 --- a/src/Umbraco.Web.Website/ViewEngines/RenderRazorViewEngineOptionsSetup.cs +++ b/src/Umbraco.Web.Website/ViewEngines/RenderRazorViewEngineOptionsSetup.cs @@ -4,7 +4,7 @@ using System.Linq; using Microsoft.AspNetCore.Mvc.Razor; using Microsoft.Extensions.Options; -namespace Umbraco.Web.Website.ViewEngines +namespace Umbraco.Cms.Web.Website.ViewEngines { /// /// Configure view engine locations for front-end rendering