From 57f7a8432cdba5f6d05f442a34114454af541cf9 Mon Sep 17 00:00:00 2001 From: Mole Date: Wed, 17 Feb 2021 15:41:54 +0100 Subject: [PATCH] Fix Merge --- .../VirtualPageApplicationModelProvider.cs | 6 +++--- .../ApplicationModels/VirtualPageConvention.cs | 6 ++---- .../Controllers/IVirtualPageController.cs | 2 +- .../Controllers/RenderController.cs | 2 -- .../Controllers/UmbracoPageController.cs | 8 ++++---- .../DependencyInjection/UmbracoBuilderExtensions.cs | 1 + .../DependencyInjection/UmbracoStartupFilter.cs | 2 +- ...rollerActionEndpointConventionBuilderExtensions.cs | 11 ++++------- .../Filters/UmbracoVirtualPageFilterAttribute.cs | 10 +++++----- .../Routing/CustomRouteContentFinderDelegate.cs | 5 ++--- src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs | 4 ++++ 11 files changed, 27 insertions(+), 30 deletions(-) diff --git a/src/Umbraco.Web.Common/ApplicationModels/VirtualPageApplicationModelProvider.cs b/src/Umbraco.Web.Common/ApplicationModels/VirtualPageApplicationModelProvider.cs index 62867d045b..f195301aeb 100644 --- a/src/Umbraco.Web.Common/ApplicationModels/VirtualPageApplicationModelProvider.cs +++ b/src/Umbraco.Web.Common/ApplicationModels/VirtualPageApplicationModelProvider.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Mvc.ApplicationModels; -using Umbraco.Core; -using Umbraco.Core.Models.PublishedContent; +using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Extensions; using Umbraco.Web.Common.Controllers; -namespace Umbraco.Web.Common.ApplicationModels +namespace Umbraco.Cms.Web.Common.ApplicationModels { /// /// Applies the to any action on a controller that is diff --git a/src/Umbraco.Web.Common/ApplicationModels/VirtualPageConvention.cs b/src/Umbraco.Web.Common/ApplicationModels/VirtualPageConvention.cs index d35af70bb0..66b68c7a85 100644 --- a/src/Umbraco.Web.Common/ApplicationModels/VirtualPageConvention.cs +++ b/src/Umbraco.Web.Common/ApplicationModels/VirtualPageConvention.cs @@ -1,9 +1,7 @@ -using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ApplicationModels; -using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.Filters; +using Umbraco.Cms.Web.Common.Filters; -namespace Umbraco.Web.Common.ApplicationModels +namespace Umbraco.Cms.Web.Common.ApplicationModels { /// /// Adds the as a convention diff --git a/src/Umbraco.Web.Common/Controllers/IVirtualPageController.cs b/src/Umbraco.Web.Common/Controllers/IVirtualPageController.cs index bfea5c8d87..edb343d226 100644 --- a/src/Umbraco.Web.Common/Controllers/IVirtualPageController.cs +++ b/src/Umbraco.Web.Common/Controllers/IVirtualPageController.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.Mvc.Filters; -using Umbraco.Core.Models.PublishedContent; +using Umbraco.Cms.Core.Models.PublishedContent; namespace Umbraco.Web.Common.Controllers { diff --git a/src/Umbraco.Web.Common/Controllers/RenderController.cs b/src/Umbraco.Web.Common/Controllers/RenderController.cs index 5fe8adb174..12896b7998 100644 --- a/src/Umbraco.Web.Common/Controllers/RenderController.cs +++ b/src/Umbraco.Web.Common/Controllers/RenderController.cs @@ -5,12 +5,10 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.ViewEngines; 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.Cms.Web.Common.ActionsResults; using Umbraco.Cms.Web.Common.Filters; -using Umbraco.Cms.Web.Common.Routing; namespace Umbraco.Cms.Web.Common.Controllers { diff --git a/src/Umbraco.Web.Common/Controllers/UmbracoPageController.cs b/src/Umbraco.Web.Common/Controllers/UmbracoPageController.cs index 33fa4ca53e..0e6b6d0d0c 100644 --- a/src/Umbraco.Web.Common/Controllers/UmbracoPageController.cs +++ b/src/Umbraco.Web.Common/Controllers/UmbracoPageController.cs @@ -2,11 +2,11 @@ using System; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.Extensions.Logging; -using Umbraco.Core.Models.PublishedContent; -using Umbraco.Web.Common.Routing; -using Umbraco.Web.Routing; +using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Cms.Core.Routing; +using Umbraco.Cms.Web.Common.Routing; -namespace Umbraco.Web.Common.Controllers +namespace Umbraco.Cms.Web.Common.Controllers { /// /// An abstract controller for a front-end Umbraco page diff --git a/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs index e80096dcbe..f941a4a0f7 100644 --- a/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs @@ -35,6 +35,7 @@ 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.DependencyInjection; using Umbraco.Cms.Web.Common.Install; using Umbraco.Cms.Web.Common.Localization; using Umbraco.Cms.Web.Common.Macros; diff --git a/src/Umbraco.Web.Common/DependencyInjection/UmbracoStartupFilter.cs b/src/Umbraco.Web.Common/DependencyInjection/UmbracoStartupFilter.cs index 008f8b0b35..3c7e47350b 100644 --- a/src/Umbraco.Web.Common/DependencyInjection/UmbracoStartupFilter.cs +++ b/src/Umbraco.Web.Common/DependencyInjection/UmbracoStartupFilter.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Umbraco.Extensions; -namespace Umbraco.Web.Common.DependencyInjection +namespace Umbraco.Cms.Web.Common.DependencyInjection { /// /// A registered early in DI so that it executes before any user IStartupFilters diff --git a/src/Umbraco.Web.Common/Extensions/ControllerActionEndpointConventionBuilderExtensions.cs b/src/Umbraco.Web.Common/Extensions/ControllerActionEndpointConventionBuilderExtensions.cs index d30436c87b..8da2e26b61 100644 --- a/src/Umbraco.Web.Common/Extensions/ControllerActionEndpointConventionBuilderExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/ControllerActionEndpointConventionBuilderExtensions.cs @@ -1,17 +1,14 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Routing; -using Umbraco.Core.Models.PublishedContent; -using Umbraco.Web.Common.Filters; +using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Cms.Web.Common.Filters; +using Umbraco.Cms.Web.Common.Routing; -namespace Umbraco.Web.Common.Extensions +namespace Umbraco.Extensions { public static class ControllerActionEndpointConventionBuilderExtensions { diff --git a/src/Umbraco.Web.Common/Filters/UmbracoVirtualPageFilterAttribute.cs b/src/Umbraco.Web.Common/Filters/UmbracoVirtualPageFilterAttribute.cs index 988608c2c2..7adf882488 100644 --- a/src/Umbraco.Web.Common/Filters/UmbracoVirtualPageFilterAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/UmbracoVirtualPageFilterAttribute.cs @@ -6,13 +6,13 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.DependencyInjection; -using Umbraco.Core.Models.PublishedContent; +using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Cms.Core.Routing; +using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Web.Common.Routing; using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.Extensions; -using Umbraco.Web.Common.Routing; -using Umbraco.Web.Routing; -namespace Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Web.Common.Filters { /// /// Used to set the request feature based on the specified (if any) diff --git a/src/Umbraco.Web.Common/Routing/CustomRouteContentFinderDelegate.cs b/src/Umbraco.Web.Common/Routing/CustomRouteContentFinderDelegate.cs index 5be3b4b952..7f835f7996 100644 --- a/src/Umbraco.Web.Common/Routing/CustomRouteContentFinderDelegate.cs +++ b/src/Umbraco.Web.Common/Routing/CustomRouteContentFinderDelegate.cs @@ -1,9 +1,8 @@ using System; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Filters; -using Umbraco.Core.Models.PublishedContent; +using Umbraco.Cms.Core.Models.PublishedContent; -namespace Umbraco.Web.Common.Extensions +namespace Umbraco.Cms.Web.Common.Routing { internal class CustomRouteContentFinderDelegate { diff --git a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs index 7a4c9474a0..45f7f17fc9 100644 --- a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs +++ b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs @@ -3,6 +3,10 @@ using System.Web; using System.Web.Mvc; using System.Web.Routing; using Microsoft.Extensions.DependencyInjection; +using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Cms.Core.Routing; +using Umbraco.Cms.Core.Web; +using Umbraco.Web.Composing; using Umbraco.Web.Models; using Umbraco.Web.Routing;