Fix Merge

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
 {
     /// <summary>
     /// Applies the <see cref="VirtualPageConvention"/> to any action on a controller that is <see cref="IVirtualPageController"/>

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
 {
     /// <summary>
     /// Adds the <see cref="UmbracoVirtualPageFilterAttribute"/> as a convention

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
 {

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
 {

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
 {
     /// <summary>
     /// An abstract controller for a front-end Umbraco page

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;

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
 {
     /// <summary>
     /// A <see cref="IStartupFilter"/> registered early in DI so that it executes before any user IStartupFilters

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
     {

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
 {
     /// <summary>
     /// Used to set the <see cref="UmbracoRouteValues"/> request feature based on the <see cref="CustomRouteContentFinderDelegate"/> specified (if any)

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
     {

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;