Removes new namespaces: Umbraco.Core.Cookie, Umbraco.Core.Session, Umbraco.Core.Request, these are web things and should be part of one namespace

src/Umbraco.Core/Routing/ContentFinderByIdPath.cs

@@ -4,7 +4,6 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Models.PublishedContent;
 using System.Globalization;
-using Umbraco.Core.Request;
 
 namespace Umbraco.Web.Routing
 {

src/Umbraco.Core/Routing/ContentFinderByPageIdQuery.cs

@@ -1,5 +1,4 @@
-using Umbraco.Core.Request;
-
+
 namespace Umbraco.Web.Routing
 {
     /// <summary>

src/Umbraco.Core/Routing/PublishedRouter.cs

@@ -8,7 +8,6 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Request;
 using Umbraco.Core.Services;
 using Umbraco.Web.Security;
 

src/Umbraco.Core/Trees/SearchableTreeAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Web.Search
+namespace Umbraco.Web.Trees
 {
     [AttributeUsage(AttributeTargets.Class)]
     public sealed class SearchableTreeAttribute : Attribute

src/Umbraco.Core/Web/ICookieManager.cs

@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Cookie
+namespace Umbraco.Web
 {
     public interface ICookieManager
     {

src/Umbraco.Core/Web/IRequestAccessor.cs

@@ -1,7 +1,7 @@
 using System;
 using Umbraco.Web.Routing;
 
-namespace Umbraco.Core.Request
+namespace Umbraco.Web
 {
     public interface IRequestAccessor
     {

src/Umbraco.Core/Web/ISessionManager.cs

@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Session
+namespace Umbraco.Web
 {
     public interface ISessionManager
     {

src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs

@@ -11,7 +11,6 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Hosting;
-using Umbraco.Core.Request;
 
 namespace Umbraco.Web
 {

src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs

@@ -4,7 +4,6 @@ using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Request;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Core.Sync;

src/Umbraco.Infrastructure/Intall/InstallHelper.cs

@@ -5,7 +5,6 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Cookie;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Models;

src/Umbraco.Infrastructure/Migrations/PostMigrations/ClearCsrfCookies.cs

@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Cookie;
 using Umbraco.Core.Migrations;
 
 namespace Umbraco.Web.Migrations.PostMigrations

src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs

@@ -9,7 +9,6 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Request;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;

src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs

@@ -1,8 +1,7 @@
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Request;
 using Umbraco.Tests.TestHelpers;
+using Umbraco.Web;
 using Umbraco.Web.Routing;
 
 namespace Umbraco.Tests.Routing

src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs

@@ -1,6 +1,5 @@
 using Moq;
 using NUnit.Framework;
-using Umbraco.Core.Request;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web;
 using Umbraco.Web.Routing;

src/Umbraco.Tests/TestHelpers/BaseWebTest.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Threading;
 using Moq;
 using NUnit.Framework;
@@ -7,17 +6,11 @@ using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Request;
 using Umbraco.Core.Services;
-using Umbraco.Core.Services.Implement;
-using Umbraco.Core.Strings;
 using Umbraco.Tests.Common;
 using Umbraco.Tests.PublishedContent;
 using Umbraco.Tests.TestHelpers.Stubs;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Models.PublishedContent;

src/Umbraco.Tests/Testing/UmbracoTestBase.cs

@@ -14,7 +14,6 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.IO.MediaPathSchemes;
@@ -51,10 +50,8 @@ using Umbraco.Web.Templates;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Core.Dictionary;
 using Umbraco.Net;
-using Umbraco.Core.Request;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
-using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Web.AspNet;
 using Umbraco.Web.Install;
 using Umbraco.Web.Security;

src/Umbraco.Web/AspNet/AspNetCookieManager.cs

@@ -1,5 +1,4 @@
 using System.Web;
-using Umbraco.Core.Cookie;
 
 namespace Umbraco.Web
 {

src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs

@@ -1,5 +1,4 @@
 using System;
-using Umbraco.Core.Request;
 using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.AspNet

src/Umbraco.Web/AspNet/AspNetSessionManager.cs

@@ -1,6 +1,5 @@
 using System.Web;
 using Umbraco.Net;
-using Umbraco.Core.Session;
 
 namespace Umbraco.Web.AspNet
 {

src/Umbraco.Web/Editors/PreviewController.cs

@@ -6,10 +6,7 @@ using System.Web.UI;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Cookie;
 using Umbraco.Core.Hosting;
-using Umbraco.Core.IO;
-using Umbraco.Core.Runtime;
 using Umbraco.Core.Services;
 using Umbraco.Core.WebAssets;
 using Umbraco.Web.Composing;

src/Umbraco.Web/HttpCookieExtensions.cs

@@ -5,7 +5,6 @@ using System.Net.Http.Headers;
 using System.Web;
 using Microsoft.Owin;
 using Umbraco.Core;
-using Umbraco.Core.Cookie;
 
 namespace Umbraco.Web
 {

src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs

@@ -11,7 +11,6 @@ using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Services;
 using Umbraco.Web.Install.Models;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Cookie;
 
 namespace Umbraco.Web.Install.InstallSteps
 {

src/Umbraco.Web/Macros/MacroRenderer.cs

@@ -6,16 +6,13 @@ using System.Text;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Cookie;
 using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Macros;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Request;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
-using Umbraco.Core.Session;
 
 namespace Umbraco.Web.Macros
 {

src/Umbraco.Web/Runtime/WebInitialComposer.cs

@@ -6,7 +6,6 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Cookie;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Events;
 using Umbraco.Core.Hosting;
@@ -45,8 +44,6 @@ using Umbraco.Web.WebApi;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Examine;
 using Umbraco.Net;
-using Umbraco.Core.Request;
-using Umbraco.Core.Session;
 using Umbraco.Web.AspNet;
 using Umbraco.Core.Media;
 using Umbraco.Infrastructure.Media;

src/Umbraco.Web/Security/BackOfficeCookieManager.cs

@@ -20,7 +20,7 @@ namespace Umbraco.Web.Security
     /// Umbraco's back office cookie needs to be read on two paths: /umbraco and /install and /base therefore we cannot just set the cookie path to be /umbraco,
     /// instead we'll specify our own cookie manager and return null if the request isn't for an acceptable path.
     /// </remarks>
-    internal class BackOfficeCookieManager : ChunkingCookieManager, ICookieManager
+    internal class BackOfficeCookieManager : ChunkingCookieManager, Microsoft.Owin.Infrastructure.ICookieManager
     {
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly IRuntimeState _runtime;
@@ -52,7 +52,7 @@ namespace Umbraco.Web.Security
         /// <param name="context"></param>
         /// <param name="key"></param>
         /// <returns></returns>
-        string ICookieManager.GetRequestCookie(IOwinContext context, string key)
+        string Microsoft.Owin.Infrastructure.ICookieManager.GetRequestCookie(IOwinContext context, string key)
         {
             if (_umbracoContextAccessor.UmbracoContext == null || context.Request.Uri.IsClientSideRequest())
             {

src/Umbraco.Web/Security/SessionIdValidator.cs

@@ -47,7 +47,7 @@ namespace Umbraco.Web.Security
         public static async Task<bool> ValidateSessionAsync(
             TimeSpan validateInterval,
             IOwinContext owinCtx,
-            ICookieManager cookieManager,
+            Microsoft.Owin.Infrastructure.ICookieManager cookieManager,
             ISystemClock systemClock,
             DateTimeOffset? authTicketIssueDate,
             ClaimsIdentity currentIdentity,

src/Umbraco.Web/UmbracoContext.cs

@@ -2,9 +2,7 @@ using System;
 using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Cookie;
 using Umbraco.Core.Hosting;
-using Umbraco.Core.IO;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;

src/Umbraco.Web/UmbracoContextFactory.cs

@@ -2,9 +2,7 @@
 using System.IO;
 using System.Text;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Cookie;
 using Umbraco.Core.Hosting;
-using Umbraco.Core.IO;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
 using Umbraco.Web.PublishedCache;