From 85eb44ecc35795118b0c4e425eef4fa4738e5ac0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 27 May 2019 10:16:07 +0200
Subject: [PATCH] Moved more abstractions of models

---
 .../Models/AuditType.cs                       |  0
 .../Models/ContentTypeSort.cs                 |  2 +-
 .../Models/IAuditEntry.cs                     |  0
 .../Models/IAuditItem.cs                      |  0
 .../Models/IDictionaryItem.cs                 |  0
 .../Models/IDictionaryTranslation.cs          |  1 -
 .../Models/IDomain.cs                         |  0
 .../Models/IFile.cs                           |  0
 .../Models/ILanguage.cs                       |  0
 .../Models/IMacro.cs                          |  0
 .../Models/IMacroProperty.cs                  |  0
 .../Models/IMemberGroup.cs                    |  0
 .../Models/IMigrationEntry.cs                 |  0
 .../Models/IPartialView.cs                    |  0
 .../Models/IRedirectUrl.cs                    |  0
 .../Models/IRelation.cs                       |  0
 .../Models/IRelationType.cs                   |  0
 .../Models/IServerRegistration.cs             |  0
 .../Models/ISimpleContentType.cs              |  0
 .../Models/ITag.cs                            |  0
 .../Models/ITemplate.cs                       |  0
 .../Models/MacroPropertyCollection.cs         |  3 --
 .../Models/MacroTypes.cs                      |  0
 .../Models/PartialViewType.cs                 |  0
 .../Models/ValueStorageType.cs                |  0
 .../Sync/IServerAddress.cs                    |  0
 .../IDataEditor.cs                            |  0
 .../IDataValueEditor.cs                       |  0
 src/Umbraco.Core/Models/PropertyType.cs       |  3 +-
 src/Umbraco.Core/Umbraco.Core.csproj          | 50 +++++--------------
 30 files changed, 14 insertions(+), 45 deletions(-)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/AuditType.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/ContentTypeSort.cs (98%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IAuditEntry.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IAuditItem.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IDictionaryItem.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IDictionaryTranslation.cs (93%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IDomain.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IFile.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/ILanguage.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IMacro.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IMacroProperty.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IMemberGroup.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IMigrationEntry.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IPartialView.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IRedirectUrl.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IRelation.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IRelationType.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IServerRegistration.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/ISimpleContentType.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/ITag.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/ITemplate.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/MacroPropertyCollection.cs (95%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/MacroTypes.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/PartialViewType.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/ValueStorageType.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Sync/IServerAddress.cs (100%)
 rename src/Umbraco.Core/{PropertyEditors => Models}/IDataEditor.cs (100%)
 rename src/Umbraco.Core/{PropertyEditors => Models}/IDataValueEditor.cs (100%)

diff --git a/src/Umbraco.Core/Models/AuditType.cs b/src/Umbraco.Abstractions/Models/AuditType.cs
similarity index 100%
rename from src/Umbraco.Core/Models/AuditType.cs
rename to src/Umbraco.Abstractions/Models/AuditType.cs
diff --git a/src/Umbraco.Core/Models/ContentTypeSort.cs b/src/Umbraco.Abstractions/Models/ContentTypeSort.cs
similarity index 98%
rename from src/Umbraco.Core/Models/ContentTypeSort.cs
rename to src/Umbraco.Abstractions/Models/ContentTypeSort.cs
index e9442ed4c6..d5b58084b1 100644
--- a/src/Umbraco.Core/Models/ContentTypeSort.cs
+++ b/src/Umbraco.Abstractions/Models/ContentTypeSort.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Core.Models
     public class ContentTypeSort : IValueObject, IDeepCloneable
     {
         // this parameterless ctor should never be used BUT is required by AutoMapper in EntityMapperProfile
-        internal ContentTypeSort() { }
+        public ContentTypeSort() { }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="T:System.Object"/> class.
diff --git a/src/Umbraco.Core/Models/IAuditEntry.cs b/src/Umbraco.Abstractions/Models/IAuditEntry.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IAuditEntry.cs
rename to src/Umbraco.Abstractions/Models/IAuditEntry.cs
diff --git a/src/Umbraco.Core/Models/IAuditItem.cs b/src/Umbraco.Abstractions/Models/IAuditItem.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IAuditItem.cs
rename to src/Umbraco.Abstractions/Models/IAuditItem.cs
diff --git a/src/Umbraco.Core/Models/IDictionaryItem.cs b/src/Umbraco.Abstractions/Models/IDictionaryItem.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IDictionaryItem.cs
rename to src/Umbraco.Abstractions/Models/IDictionaryItem.cs
diff --git a/src/Umbraco.Core/Models/IDictionaryTranslation.cs b/src/Umbraco.Abstractions/Models/IDictionaryTranslation.cs
similarity index 93%
rename from src/Umbraco.Core/Models/IDictionaryTranslation.cs
rename to src/Umbraco.Abstractions/Models/IDictionaryTranslation.cs
index 1c6db5e099..5cbec40b81 100644
--- a/src/Umbraco.Core/Models/IDictionaryTranslation.cs
+++ b/src/Umbraco.Abstractions/Models/IDictionaryTranslation.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
-using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
diff --git a/src/Umbraco.Core/Models/IDomain.cs b/src/Umbraco.Abstractions/Models/IDomain.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IDomain.cs
rename to src/Umbraco.Abstractions/Models/IDomain.cs
diff --git a/src/Umbraco.Core/Models/IFile.cs b/src/Umbraco.Abstractions/Models/IFile.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IFile.cs
rename to src/Umbraco.Abstractions/Models/IFile.cs
diff --git a/src/Umbraco.Core/Models/ILanguage.cs b/src/Umbraco.Abstractions/Models/ILanguage.cs
similarity index 100%
rename from src/Umbraco.Core/Models/ILanguage.cs
rename to src/Umbraco.Abstractions/Models/ILanguage.cs
diff --git a/src/Umbraco.Core/Models/IMacro.cs b/src/Umbraco.Abstractions/Models/IMacro.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IMacro.cs
rename to src/Umbraco.Abstractions/Models/IMacro.cs
diff --git a/src/Umbraco.Core/Models/IMacroProperty.cs b/src/Umbraco.Abstractions/Models/IMacroProperty.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IMacroProperty.cs
rename to src/Umbraco.Abstractions/Models/IMacroProperty.cs
diff --git a/src/Umbraco.Core/Models/IMemberGroup.cs b/src/Umbraco.Abstractions/Models/IMemberGroup.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IMemberGroup.cs
rename to src/Umbraco.Abstractions/Models/IMemberGroup.cs
diff --git a/src/Umbraco.Core/Models/IMigrationEntry.cs b/src/Umbraco.Abstractions/Models/IMigrationEntry.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IMigrationEntry.cs
rename to src/Umbraco.Abstractions/Models/IMigrationEntry.cs
diff --git a/src/Umbraco.Core/Models/IPartialView.cs b/src/Umbraco.Abstractions/Models/IPartialView.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IPartialView.cs
rename to src/Umbraco.Abstractions/Models/IPartialView.cs
diff --git a/src/Umbraco.Core/Models/IRedirectUrl.cs b/src/Umbraco.Abstractions/Models/IRedirectUrl.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IRedirectUrl.cs
rename to src/Umbraco.Abstractions/Models/IRedirectUrl.cs
diff --git a/src/Umbraco.Core/Models/IRelation.cs b/src/Umbraco.Abstractions/Models/IRelation.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IRelation.cs
rename to src/Umbraco.Abstractions/Models/IRelation.cs
diff --git a/src/Umbraco.Core/Models/IRelationType.cs b/src/Umbraco.Abstractions/Models/IRelationType.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IRelationType.cs
rename to src/Umbraco.Abstractions/Models/IRelationType.cs
diff --git a/src/Umbraco.Core/Models/IServerRegistration.cs b/src/Umbraco.Abstractions/Models/IServerRegistration.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IServerRegistration.cs
rename to src/Umbraco.Abstractions/Models/IServerRegistration.cs
diff --git a/src/Umbraco.Core/Models/ISimpleContentType.cs b/src/Umbraco.Abstractions/Models/ISimpleContentType.cs
similarity index 100%
rename from src/Umbraco.Core/Models/ISimpleContentType.cs
rename to src/Umbraco.Abstractions/Models/ISimpleContentType.cs
diff --git a/src/Umbraco.Core/Models/ITag.cs b/src/Umbraco.Abstractions/Models/ITag.cs
similarity index 100%
rename from src/Umbraco.Core/Models/ITag.cs
rename to src/Umbraco.Abstractions/Models/ITag.cs
diff --git a/src/Umbraco.Core/Models/ITemplate.cs b/src/Umbraco.Abstractions/Models/ITemplate.cs
similarity index 100%
rename from src/Umbraco.Core/Models/ITemplate.cs
rename to src/Umbraco.Abstractions/Models/ITemplate.cs
diff --git a/src/Umbraco.Core/Models/MacroPropertyCollection.cs b/src/Umbraco.Abstractions/Models/MacroPropertyCollection.cs
similarity index 95%
rename from src/Umbraco.Core/Models/MacroPropertyCollection.cs
rename to src/Umbraco.Abstractions/Models/MacroPropertyCollection.cs
index dd5056e19c..1017ba8c8c 100644
--- a/src/Umbraco.Core/Models/MacroPropertyCollection.cs
+++ b/src/Umbraco.Abstractions/Models/MacroPropertyCollection.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System.Linq;
 using Umbraco.Core.Collections;
 
 namespace Umbraco.Core.Models
diff --git a/src/Umbraco.Core/Models/MacroTypes.cs b/src/Umbraco.Abstractions/Models/MacroTypes.cs
similarity index 100%
rename from src/Umbraco.Core/Models/MacroTypes.cs
rename to src/Umbraco.Abstractions/Models/MacroTypes.cs
diff --git a/src/Umbraco.Core/Models/PartialViewType.cs b/src/Umbraco.Abstractions/Models/PartialViewType.cs
similarity index 100%
rename from src/Umbraco.Core/Models/PartialViewType.cs
rename to src/Umbraco.Abstractions/Models/PartialViewType.cs
diff --git a/src/Umbraco.Core/Models/ValueStorageType.cs b/src/Umbraco.Abstractions/Models/ValueStorageType.cs
similarity index 100%
rename from src/Umbraco.Core/Models/ValueStorageType.cs
rename to src/Umbraco.Abstractions/Models/ValueStorageType.cs
diff --git a/src/Umbraco.Core/Sync/IServerAddress.cs b/src/Umbraco.Abstractions/Sync/IServerAddress.cs
similarity index 100%
rename from src/Umbraco.Core/Sync/IServerAddress.cs
rename to src/Umbraco.Abstractions/Sync/IServerAddress.cs
diff --git a/src/Umbraco.Core/PropertyEditors/IDataEditor.cs b/src/Umbraco.Core/Models/IDataEditor.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/IDataEditor.cs
rename to src/Umbraco.Core/Models/IDataEditor.cs
diff --git a/src/Umbraco.Core/PropertyEditors/IDataValueEditor.cs b/src/Umbraco.Core/Models/IDataValueEditor.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/IDataValueEditor.cs
rename to src/Umbraco.Core/Models/IDataValueEditor.cs
diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs
index 1e950a876c..908491fbb2 100644
--- a/src/Umbraco.Core/Models/PropertyType.cs
+++ b/src/Umbraco.Core/Models/PropertyType.cs
@@ -2,7 +2,6 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.Serialization;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Strings;
 
@@ -407,7 +406,7 @@ namespace Umbraco.Core.Models
             base.PerformDeepClone(clone);
 
             var clonedEntity = (PropertyType)clone;
-            
+
             //need to manually assign the Lazy value as it will not be automatically mapped
             if (PropertyGroupId != null)
             {
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index dd3359c961..67bafd813f 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -200,6 +200,18 @@
     <Compile Include="Migrations\Upgrade\V_8_1_0\ConvertTinyMceAndGridMediaUrlsToLocalLink.cs" />
     <Compile Include="Models\ContentBaseExtensions.cs" />
     <Compile Include="Models\CultureImpact.cs" />
+    <Compile Include="Models\IContent.cs" />
+    <Compile Include="Models\IContentBase.cs" />
+    <Compile Include="Models\IContentType.cs" />
+    <Compile Include="Models\IContentTypeBase.cs" />
+    <Compile Include="Models\IContentTypeComposition.cs" />
+    <Compile Include="Models\IDataEditor.cs" />
+    <Compile Include="Models\IDataType.cs" />
+    <Compile Include="Models\IDataValueEditor.cs" />
+    <Compile Include="Models\IMedia.cs" />
+    <Compile Include="Models\IMediaType.cs" />
+    <Compile Include="Models\IMember.cs" />
+    <Compile Include="Models\IMemberType.cs" />
     <Compile Include="Models\PublishedContent\ILivePublishedModelFactory.cs" />
     <Compile Include="Persistence\Dtos\PropertyTypeCommonDto.cs" />
     <Compile Include="Persistence\Repositories\Implement\ContentTypeCommonRepository.cs" />
@@ -390,9 +402,6 @@
     <Compile Include="Models\ContentCultureInfosCollection.cs" />
     <Compile Include="Models\DataTypeExtensions.cs" />
     <Compile Include="Models\Editors\ContentPropertyFile.cs" />
-    <Compile Include="Models\IAuditEntry.cs" />
-    <Compile Include="Models\IAuditItem.cs" />
-    <Compile Include="Models\ISimpleContentType.cs" />
     <Compile Include="Models\Identity\IdentityMapDefinition.cs" />
     <Compile Include="Models\Membership\MemberExportModel.cs" />
     <Compile Include="Models\Membership\MemberExportProperty.cs" />
@@ -460,7 +469,6 @@
     <Compile Include="PropertyEditors\EditorType.cs" />
     <Compile Include="PropertyEditors\IConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\IConfigureValueType.cs" />
-    <Compile Include="PropertyEditors\IDataEditor.cs" />
     <Compile Include="PropertyEditors\ImageCropperConfiguration.cs" />
     <Compile Include="PropertyEditors\IManifestValueValidator.cs" />
     <Compile Include="PropertyEditors\IValueFormatValidator.cs" />
@@ -600,7 +608,6 @@
     <Compile Include="Migrations\Upgrade\Upgrader.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DropMigrationsTable.cs" />
     <Compile Include="Models\AuditItem.cs" />
-    <Compile Include="Models\AuditType.cs" />
     <Compile Include="Models\Content.cs" />
     <Compile Include="Models\ContentBase.cs" />
     <Compile Include="ContentExtensions.cs" />
@@ -610,8 +617,6 @@
     <Compile Include="Models\ContentTypeAvailableCompositionsResults.cs" />
     <Compile Include="Models\ContentTypeBase.cs" />
     <Compile Include="Models\ContentTypeCompositionBase.cs" />
-    <Compile Include="Models\ContentTypeSort.cs" />
-    <Compile Include="Models\ValueStorageType.cs" />
     <Compile Include="Models\DataType.cs" />
     <Compile Include="Models\DictionaryItem.cs" />
     <Compile Include="Models\DictionaryItemExtensions.cs" />
@@ -622,43 +627,15 @@
     <Compile Include="Models\File.cs" />
     <Compile Include="Models\Folder.cs" />
     <Compile Include="Models\GridValue.cs" />
-    <Compile Include="Models\IContent.cs" />
-    <Compile Include="Models\IContentBase.cs" />
-    <Compile Include="Models\IContentType.cs" />
-    <Compile Include="Models\IContentTypeBase.cs" />
-    <Compile Include="Models\IContentTypeComposition.cs" />
-    <Compile Include="Models\IDataType.cs" />
     <Compile Include="Models\Identity\BackOfficeIdentityUser.cs" />
     <Compile Include="Models\Identity\IdentityUser.cs" />
     <Compile Include="Models\Identity\IdentityUserClaim.cs" />
     <Compile Include="Models\Identity\IdentityUserLogin.cs" />
     <Compile Include="Models\Identity\IdentityUserRole.cs" />
     <Compile Include="Models\Identity\IIdentityUserLogin.cs" />
-    <Compile Include="Models\IDictionaryItem.cs" />
-    <Compile Include="Models\IDictionaryTranslation.cs" />
-    <Compile Include="Models\IDomain.cs" />
-    <Compile Include="Models\IFile.cs" />
-    <Compile Include="Models\ILanguage.cs" />
-    <Compile Include="Models\IMacro.cs" />
-    <Compile Include="Models\IMacroProperty.cs" />
-    <Compile Include="Models\IMedia.cs" />
-    <Compile Include="Models\IMediaType.cs" />
-    <Compile Include="Models\IMember.cs" />
-    <Compile Include="Models\IMemberGroup.cs" />
-    <Compile Include="Models\IMemberType.cs" />
-    <Compile Include="Models\IMigrationEntry.cs" />
-    <Compile Include="Models\IPartialView.cs" />
-    <Compile Include="Models\IRedirectUrl.cs" />
-    <Compile Include="Models\IRelation.cs" />
-    <Compile Include="Models\IRelationType.cs" />
-    <Compile Include="Models\IServerRegistration.cs" />
-    <Compile Include="Models\ITag.cs" />
-    <Compile Include="Models\ITemplate.cs" />
     <Compile Include="Models\Language.cs" />
     <Compile Include="Models\Macro.cs" />
     <Compile Include="Models\MacroProperty.cs" />
-    <Compile Include="Models\MacroPropertyCollection.cs" />
-    <Compile Include="Models\MacroTypes.cs" />
     <Compile Include="Models\Media.cs" />
     <Compile Include="Models\MediaExtensions.cs" />
     <Compile Include="Models\MediaType.cs" />
@@ -693,7 +670,6 @@
     <Compile Include="Models\Packaging\PreInstallWarnings.cs" />
     <Compile Include="Models\PagedResult.cs" />
     <Compile Include="Models\PartialView.cs" />
-    <Compile Include="Models\PartialViewType.cs" />
     <Compile Include="Models\Property.cs" />
     <Compile Include="Models\PropertyCollection.cs" />
     <Compile Include="Models\PropertyGroup.cs" />
@@ -1166,7 +1142,6 @@
     <Compile Include="PropertyEditors\Validators\IntegerValidator.cs" />
     <Compile Include="PropertyEditors\IValueValidator.cs" />
     <Compile Include="PropertyEditors\IPropertyValueConverter.cs" />
-    <Compile Include="PropertyEditors\IDataValueEditor.cs" />
     <Compile Include="PropertyEditors\DataEditor.cs" />
     <Compile Include="PropertyEditors\ConfigurationField.cs" />
     <Compile Include="PropertyEditors\ConfigurationFieldAttribute.cs" />
@@ -1360,7 +1335,6 @@
     <Compile Include="Sync\DatabaseServerMessengerOptions.cs" />
     <Compile Include="Sync\DatabaseServerRegistrar.cs" />
     <Compile Include="Sync\DatabaseServerRegistrarOptions.cs" />
-    <Compile Include="Sync\IServerAddress.cs" />
     <Compile Include="Sync\IServerMessenger.cs" />
     <Compile Include="Sync\IServerRegistrar.cs" />
     <Compile Include="Sync\MessageType.cs" />