Align namespaces in root of infrastructure

src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs

@@ -42,7 +42,6 @@ using Umbraco.Cms.Infrastructure.Serialization;
 using Umbraco.Core;
 using Umbraco.Core.Packaging;
 using Umbraco.Extensions;
-using Umbraco.Web;
 
 namespace Umbraco.Cms.Infrastructure.DependencyInjection
 {

src/Umbraco.Infrastructure/EmailSender.cs

@@ -13,7 +13,7 @@ using Umbraco.Cms.Core.Mail;
 using Umbraco.Cms.Core.Models;
 using SmtpClient = MailKit.Net.Smtp.SmtpClient;
 
-namespace Umbraco.Core
+namespace Umbraco.Cms.Infrastructure
 {
     /// <summary>
     /// A utility class for sending emails

src/Umbraco.Infrastructure/Extensions/ObjectJsonExtensions.cs

@@ -1,17 +1,12 @@
 using System;
-using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
-using System.Linq.Expressions;
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Xml;
 using Newtonsoft.Json;
 using Umbraco.Cms.Core;
 
-namespace Umbraco.Core
+namespace Umbraco.Extensions
 {
     /// <summary>
     /// Provides object extension methods.

src/Umbraco.Infrastructure/HostedServices/ScheduledPublishing.cs

@@ -12,7 +12,6 @@ using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Core.Web;
-using Umbraco.Web;
 
 namespace Umbraco.Cms.Infrastructure.HostedServices
 {

src/Umbraco.Infrastructure/IPublishedContentQuery.cs

@@ -2,22 +2,16 @@
 using System.Collections.Generic;
 using System.Xml.XPath;
 using Examine.Search;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Xml;
-using Umbraco.Core;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Web
+namespace Umbraco.Cms.Core
 {
     /// <summary>
     /// Query methods used for accessing strongly typed content in templates
     /// </summary>
     public interface IPublishedContentQuery
     {
-
-
-
         IPublishedContent Content(int id);
         IPublishedContent Content(Guid id);
         IPublishedContent Content(Udi id);

src/Umbraco.Infrastructure/PublishedContentQuery.cs

@@ -13,7 +13,7 @@ using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Extensions;
 using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Web
+namespace Umbraco.Cms.Infrastructure
 {
     /// <summary>
     ///     A class used to query for published content, media items

src/Umbraco.Infrastructure/Routing/ContentFinderByConfigured404.cs

@@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Web;
-using Umbraco.Web;
+using Umbraco.Cms.Infrastructure;
 
 namespace Umbraco.Cms.Core.Routing
 {

src/Umbraco.Infrastructure/Routing/NotFoundHandlerHelper.cs

@@ -8,7 +8,6 @@ using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Xml;
 using Umbraco.Extensions;
-using Umbraco.Web;
 
 namespace Umbraco.Cms.Core.Routing
 {

src/Umbraco.Infrastructure/RuntimeState.cs

@@ -12,7 +12,7 @@ using Umbraco.Cms.Infrastructure.Migrations.Install;
 using Umbraco.Cms.Infrastructure.Migrations.Upgrade;
 using Umbraco.Cms.Infrastructure.Persistence;
 
-namespace Umbraco.Core
+namespace Umbraco.Cms.Core
 {
     /// <summary>
     /// Represents the state of the Umbraco runtime.

src/Umbraco.Infrastructure/Search/ExamineComponent.cs

@@ -16,7 +16,6 @@ using Umbraco.Cms.Core.Services.Changes;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Extensions;
-using Umbraco.Web;
 
 namespace Umbraco.Cms.Infrastructure.Search
 {

src/Umbraco.Infrastructure/Suspendable.cs

@@ -4,7 +4,7 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Cms.Infrastructure.Search;
 
-namespace Umbraco.Web
+namespace Umbraco.Cms.Infrastructure
 {
     internal static class Suspendable
     {

src/Umbraco.Infrastructure/TagQuery.cs

@@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Services;
 
-namespace Umbraco.Web
+namespace Umbraco.Cms.Core
 {
     /// <summary>
     /// Implements <see cref="ITagQuery"/>.

src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs

@@ -32,6 +32,7 @@ using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Runtime;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Strings;
+using Umbraco.Cms.Infrastructure;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
 using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;

src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs

@@ -8,7 +8,7 @@ using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
-using Umbraco.Core;
+using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
 {

src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs

@@ -11,8 +11,8 @@ using Umbraco.Cms.Core.Runtime;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Core.Web;
+using Umbraco.Cms.Infrastructure;
 using Umbraco.Cms.Infrastructure.HostedServices;
-using Umbraco.Web;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices
 {

src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs

@@ -22,7 +22,6 @@ using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers.Objects;
 using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Cms.Web.Website.Controllers;
-using Umbraco.Web;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Controllers
 {

src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs

@@ -7,6 +7,7 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Infrastructure;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Extensions;
 using Umbraco.Tests.Testing;

src/Umbraco.Tests/TestHelpers/TestHelper.cs

@@ -32,6 +32,7 @@ using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Runtime;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Strings;
+using Umbraco.Cms.Infrastructure;
 using Umbraco.Cms.Infrastructure.Migrations.Install;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Persistence.SqlCe;

src/Umbraco.Tests/Testing/UmbracoTestBase.cs

@@ -48,6 +48,7 @@ using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Core.Templates;
 using Umbraco.Cms.Core.Trees;
 using Umbraco.Cms.Core.Web;
+using Umbraco.Cms.Infrastructure;
 using Umbraco.Cms.Infrastructure.DependencyInjection;
 using Umbraco.Cms.Infrastructure.Media;
 using Umbraco.Cms.Infrastructure.Migrations.Install;

src/Umbraco.Tests/Web/PublishedContentQueryTests.cs

@@ -8,6 +8,7 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
+using Umbraco.Cms.Infrastructure;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web;

src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs

@@ -16,6 +16,7 @@ using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Trees;
 using Umbraco.Cms.Core.WebAssets;
+using Umbraco.Cms.Infrastructure;
 using Umbraco.Cms.Web.BackOffice.HealthChecks;
 using Umbraco.Cms.Web.BackOffice.Profiling;
 using Umbraco.Cms.Web.BackOffice.PropertyEditors;

src/Umbraco.Web.BackOffice/Controllers/EntityController.cs

@@ -24,7 +24,6 @@ using Umbraco.Cms.Web.BackOffice.ModelBinders;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.ModelBinders;
 using Umbraco.Extensions;
-using Umbraco.Web;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Cms.Web.BackOffice.Controllers

src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs

@@ -3,13 +3,13 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using Umbraco.Cms.Core;
 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 Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Cms.Web.BackOffice.Controllers

src/Umbraco.Web.BackOffice/Controllers/UsersController.cs

@@ -29,6 +29,7 @@ using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
+using Umbraco.Cms.Infrastructure;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Web.BackOffice.ActionResults;
 using Umbraco.Cms.Web.BackOffice.Extensions;

src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs

@@ -16,6 +16,7 @@ using Umbraco.Cms.Core.Models.Trees;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Trees;
+using Umbraco.Cms.Infrastructure;
 using Umbraco.Cms.Infrastructure.Search;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Authorization;

src/Umbraco.Web.Common/UmbracoHelper.cs

@@ -9,7 +9,6 @@ using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Core.Templates;
 using Umbraco.Cms.Core.Xml;
 using Umbraco.Extensions;
-using Umbraco.Web;
 
 namespace Umbraco.Cms.Web.Common
 {

src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Gallery.cshtml

@@ -2,7 +2,6 @@
 @using Umbraco.Cms.Core.Media
 @using Umbraco.Cms.Core.Models.PublishedContent
 @using Umbraco.Cms.Core.Routing
-@using Umbraco.Web
 @using Umbraco.Extensions
 @inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage
 @inject IPublishedValueFallback PublishedValueFallback

src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml

@@ -2,7 +2,6 @@
 @using Umbraco.Cms.Core.Models.PublishedContent
 @using Umbraco.Cms.Core.Routing
 @using Umbraco.Extensions
-@using Umbraco.Web
 @inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage
 @inject IPublishedContentQuery PublishedContentQuery
 @inject IPublishedValueFallback PublishedValueFallback

src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml

@@ -1,6 +1,6 @@
+@using Umbraco.Cms.Core
 @using Umbraco.Cms.Core.Routing
 @using Umbraco.Extensions
-@using Umbraco.Web
 @inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage
 @inject IPublishedContentQuery PublishedContentQuery
 @inject IPublishedUrlProvider PublishedUrlProvider

src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs

@@ -9,7 +9,6 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Examine;
-using Umbraco.Web;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Extensions