From 99da374fbf32f9d7aa4b61ba5ef75a795f19877a Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 6 Nov 2019 14:18:06 +0100
Subject: [PATCH] Move slim entities

---
 .../Models/Entities/EntityExtensions.cs                  | 7 +++----
 .../Models/Entities/IMediaEntitySlim.cs                  | 0
 .../Models/Entities/IMemberEntitySlim.cs                 | 0
 .../Models/Entities/MediaEntitySlim.cs                   | 0
 .../Models/Entities/MemberEntitySlim.cs                  | 0
 src/Umbraco.Core/Umbraco.Core.csproj                     | 9 ++-------
 6 files changed, 5 insertions(+), 11 deletions(-)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/Entities/EntityExtensions.cs (86%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/Entities/IMediaEntitySlim.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/Entities/IMemberEntitySlim.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/Entities/MediaEntitySlim.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/Entities/MemberEntitySlim.cs (100%)

diff --git a/src/Umbraco.Core/Models/Entities/EntityExtensions.cs b/src/Umbraco.Abstractions/Models/Entities/EntityExtensions.cs
similarity index 86%
rename from src/Umbraco.Core/Models/Entities/EntityExtensions.cs
rename to src/Umbraco.Abstractions/Models/Entities/EntityExtensions.cs
index 2ee6a2d5ed..2df08f207d 100644
--- a/src/Umbraco.Core/Models/Entities/EntityExtensions.cs
+++ b/src/Umbraco.Abstractions/Models/Entities/EntityExtensions.cs
@@ -2,16 +2,15 @@
 
 namespace Umbraco.Core.Models.Entities
 {
-    internal static class EntityExtensions
+    public static class EntityExtensions
     {
         /// <summary>
         /// Updates the entity when it is being saved.
         /// </summary>
-        internal static void UpdatingEntity(this IEntity entity)
+        public static void UpdatingEntity(this IEntity entity)
         {
             var now = DateTime.Now;
 
-            // just in case
             if (entity.CreateDate == default)
             {
                 entity.CreateDate = now;
@@ -27,7 +26,7 @@ namespace Umbraco.Core.Models.Entities
         /// <summary>
         /// Updates the entity when it is being saved for the first time.
         /// </summary>
-        internal static void AddingEntity(this IEntity entity)
+        public static void AddingEntity(this IEntity entity)
         {
             var now = DateTime.Now;
             var canBeDirty = entity as ICanBeDirty;
diff --git a/src/Umbraco.Core/Models/Entities/IMediaEntitySlim.cs b/src/Umbraco.Abstractions/Models/Entities/IMediaEntitySlim.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Entities/IMediaEntitySlim.cs
rename to src/Umbraco.Abstractions/Models/Entities/IMediaEntitySlim.cs
diff --git a/src/Umbraco.Core/Models/Entities/IMemberEntitySlim.cs b/src/Umbraco.Abstractions/Models/Entities/IMemberEntitySlim.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Entities/IMemberEntitySlim.cs
rename to src/Umbraco.Abstractions/Models/Entities/IMemberEntitySlim.cs
diff --git a/src/Umbraco.Core/Models/Entities/MediaEntitySlim.cs b/src/Umbraco.Abstractions/Models/Entities/MediaEntitySlim.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Entities/MediaEntitySlim.cs
rename to src/Umbraco.Abstractions/Models/Entities/MediaEntitySlim.cs
diff --git a/src/Umbraco.Core/Models/Entities/MemberEntitySlim.cs b/src/Umbraco.Abstractions/Models/Entities/MemberEntitySlim.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Entities/MemberEntitySlim.cs
rename to src/Umbraco.Abstractions/Models/Entities/MemberEntitySlim.cs
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 7fd5ebd75e..bb2ad5dec4 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -220,7 +220,6 @@
     <Compile Include="Models\ContentEditing\ContentAppBadge.cs" />
     <Compile Include="Models\ContentEditing\ContentAppBadgeType.cs" />
     <Compile Include="Models\ContentEditing\IContentAppFactory.cs" />
-    <Compile Include="Models\Entities\EntityExtensions.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorBase.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueDto.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\PropertyEditorsMigrationBase.cs" />
@@ -258,10 +257,6 @@
     <Compile Include="Models\PublicAccessEntry.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\FixLanguageIsoCodeLength.cs" />
     <Compile Include="Models\CultureImpact.cs" />
-    <Compile Include="Models\Entities\IMediaEntitySlim.cs" />
-    <Compile Include="Models\Entities\IMemberEntitySlim.cs" />
-    <Compile Include="Models\Entities\MediaEntitySlim.cs" />
-    <Compile Include="Models\Entities\MemberEntitySlim.cs" />
     <Compile Include="Models\PublishedContent\ILivePublishedModelFactory.cs" />
     <Compile Include="Models\PublishedContent\IndexedArrayItem.cs" />
     <Compile Include="Models\PublishedContent\IPublishedContent.cs" />
@@ -274,10 +269,10 @@
     <Compile Include="Models\PublishedContent\PublishedElementModel.cs" />
     <Compile Include="Models\PublishedContent\PublishedElementWrapped.cs" />
     <Compile Include="Models\PublishedContent\VariationContextAccessorExtensions.cs" />
-    <Compile Include="Models\Template.cs" />
-    <Compile Include="Models\TemplateOnDisk.cs" />
     <Compile Include="Models\PublishedContent\IPublishedContentType.cs" />
     <Compile Include="Models\PublishedContent\IPublishedPropertyType.cs" />
+    <Compile Include="Models\Template.cs" />
+    <Compile Include="Models\TemplateOnDisk.cs" />
     <Compile Include="PropertyEditors\ConfigurationField.cs" />
     <Compile Include="PropertyEditors\ConfigurationFieldAttribute.cs" />
     <Compile Include="PropertyEditors\ConfigurationFieldsExtensions.cs" />