Align namespaces in Models to Umbraco.Cms.Core

src/Umbraco.Infrastructure/Models/Blocks/BlockEditorData.cs

@@ -1,11 +1,9 @@
-using Newtonsoft.Json.Linq;
-using System;
+using System;
 using System.Collections.Generic;
-using Umbraco.Cms.Core.Models.Blocks;
+using Newtonsoft.Json.Linq;
 
-namespace Umbraco.Core.Models.Blocks
+namespace Umbraco.Cms.Core.Models.Blocks
 {
-
     /// <summary>
     /// Convertable block data from json
     /// </summary>

src/Umbraco.Infrastructure/Models/Blocks/BlockEditorDataConverter.cs

@@ -1,12 +1,10 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
 using System.Linq;
-using System.Collections.Generic;
-using Umbraco.Cms.Core.Models.Blocks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
-namespace Umbraco.Core.Models.Blocks
+namespace Umbraco.Cms.Core.Models.Blocks
 {
-
     /// <summary>
     /// Converts the block json data into objects
     /// </summary>

src/Umbraco.Infrastructure/Models/Blocks/BlockItemData.cs

@@ -1,11 +1,9 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models;
+using Newtonsoft.Json;
 using Umbraco.Core.Serialization;
 
-namespace Umbraco.Core.Models.Blocks
+namespace Umbraco.Cms.Core.Models.Blocks
 {
     /// <summary>
     /// Represents a single block's data in raw form

src/Umbraco.Infrastructure/Models/Blocks/BlockListEditorDataConverter.cs

@@ -1,9 +1,8 @@
-using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
 using System.Linq;
-using System.Collections.Generic;
-using Umbraco.Cms.Core.Models.Blocks;
+using Newtonsoft.Json.Linq;
 
-namespace Umbraco.Core.Models.Blocks
+namespace Umbraco.Cms.Core.Models.Blocks
 {
     /// <summary>
     /// Data converter for the block list property editor

src/Umbraco.Infrastructure/Models/Blocks/BlockListLayoutItem.cs

@@ -1,8 +1,7 @@
 using Newtonsoft.Json;
-using Umbraco.Cms.Core;
 using Umbraco.Core.Serialization;
 
-namespace Umbraco.Core.Models.Blocks
+namespace Umbraco.Cms.Core.Models.Blocks
 {
     /// <summary>
     /// Used for deserializing the block list layout

src/Umbraco.Infrastructure/Models/Blocks/BlockValue.cs

@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System.Collections.Generic;
 
-namespace Umbraco.Core.Models.Blocks
+namespace Umbraco.Cms.Core.Models.Blocks
 {
     public class BlockValue
     {

src/Umbraco.Infrastructure/Models/GridValue.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Umbraco.Core.Models
+namespace Umbraco.Cms.Core.Models
 {
     // TODO: Make a property value converter for this!
 

src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs

@@ -1,18 +1,14 @@
 using System;
 using System.Collections.Generic;
 using Examine;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Models.Mapping;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Web.Models.Mapping
+namespace Umbraco.Cms.Core.Models.Mapping
 {
     public class EntityMapDefinition : IMapDefinition
     {

src/Umbraco.Infrastructure/Models/PathValidationExtensions.cs

@@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Extensions;
 
-namespace Umbraco.Core.Models
+namespace Umbraco.Cms.Core.Models
 {
     /// <summary>
     /// Provides extension methods for path validation.