Align namespaces in Manifest to Umbraco.Cms.Core

If we can ditch Newtonsoft, these could all be in the core project as far as I can see

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

@@ -30,7 +30,6 @@ using Umbraco.Cms.Infrastructure.HealthChecks;
 using Umbraco.Cms.Infrastructure.HostedServices;
 using Umbraco.Cms.Infrastructure.Install;
 using Umbraco.Core;
-using Umbraco.Core.Manifest;
 using Umbraco.Core.Migrations;
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Migrations.PostMigrations;

src/Umbraco.Infrastructure/Macros/MacroTagParser.cs

@@ -5,7 +5,7 @@ using System.Text.RegularExpressions;
 using HtmlAgilityPack;
 using Umbraco.Cms.Core.Xml;
 
-namespace Umbraco.Web.Macros
+namespace Umbraco.Cms.Infrastructure.Macros
 {
     /// <summary>
     /// Parses the macro syntax in a string and renders out it's contents

src/Umbraco.Infrastructure/Manifest/DashboardAccessRuleConverter.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json.Linq;
 using Umbraco.Cms.Core.Dashboards;
 using Umbraco.Core.Serialization;
 
-namespace Umbraco.Core.Manifest
+namespace Umbraco.Cms.Core.Manifest
 {
     /// <summary>
     /// Implements a json read converter for <see cref="IAccessRule"/>.

src/Umbraco.Infrastructure/Manifest/DataEditorConverter.cs

@@ -10,7 +10,7 @@ using Umbraco.Cms.Core.Strings;
 using Umbraco.Core.Serialization;
 using Umbraco.Extensions;
 
-namespace Umbraco.Core.Manifest
+namespace Umbraco.Cms.Core.Manifest
 {
     /// <summary>
     /// Provides a json read converter for <see cref="IDataEditor"/> in manifests.

src/Umbraco.Infrastructure/Manifest/ManifestParser.cs

@@ -8,14 +8,13 @@ using Newtonsoft.Json;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Manifest;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Extensions;
 
-namespace Umbraco.Core.Manifest
+namespace Umbraco.Cms.Core.Manifest
 {
     /// <summary>
     /// Parses the Main.js file and replaces all tokens accordingly.

src/Umbraco.Infrastructure/Manifest/ValueValidatorConverter.cs

@@ -1,10 +1,9 @@
 using System;
 using Newtonsoft.Json.Linq;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Serialization;
 
-namespace Umbraco.Core.Manifest
+namespace Umbraco.Cms.Core.Manifest
 {
     /// <summary>
     /// Implements a json read converter for <see cref="IValueValidator"/>.

src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs

@@ -12,8 +12,8 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Core.Templates;
 using Umbraco.Cms.Infrastructure.Examine;
+using Umbraco.Cms.Infrastructure.Macros;
 using Umbraco.Extensions;
-using Umbraco.Web.Macros;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Web.PropertyEditors

src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs

@@ -8,8 +8,8 @@ using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Core.Templates;
 using Umbraco.Cms.Core.Web;
+using Umbraco.Cms.Infrastructure.Macros;
 using Umbraco.Extensions;
-using Umbraco.Web.Macros;
 
 namespace Umbraco.Web.PropertyEditors.ValueConverters
 {

src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs

@@ -21,7 +21,6 @@ using Umbraco.Cms.Core.PropertyEditors.Validators;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
-using Umbraco.Core.Manifest;
 using Umbraco.Core.Serialization;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Manifest

src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs

@@ -4,8 +4,8 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
+using Umbraco.Cms.Infrastructure.Macros;
 using Umbraco.Cms.Tests.Common.TestHelpers;
-using Umbraco.Web.Macros;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Macros
 {

src/Umbraco.Tests/Testing/UmbracoTestBase.cs

@@ -51,7 +51,6 @@ using Umbraco.Cms.Infrastructure.DependencyInjection;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Core;
-using Umbraco.Core.Manifest;
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Mappers;