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

---
 .../Dictionary/ICultureDictionary.cs          |  0
 .../Dictionary/ICultureDictionaryFactory.cs   |  0
 .../Models/ContentStatus.cs                   |  0
 .../Models/PublishedContent/Fallback.cs       |  0
 .../IVariationContextAccessor.cs              |  0
 .../Models/PublishedContent/ModelType.cs      |  0
 .../PublishedContent/PublishedCultureInfos.cs |  0
 .../PublishedContent/PublishedDataType.cs     |  2 +-
 .../PublishedContent/PublishedItemType.cs     |  0
 .../ThreadCultureVariationContextAccessor.cs  |  0
 .../PublishedContent/VariationContext.cs      |  0
 .../Models/Relation.cs                        |  0
 .../Models/RelationType.cs                    |  0
 .../Models/Stylesheet.cs                      |  2 +-
 .../Models/StylesheetProperty.cs              |  0
 .../Models/Tag.cs                             |  2 +-
 .../Models/TaggableObjectTypes.cs             |  0
 .../Models/TaggedEntity.cs                    |  0
 .../Models/TaggedProperty.cs                  |  0
 .../Models/TagsStorageType.cs                 |  0
 .../Models/TemplateNode.cs                    |  0
 .../Scoping/IInstanceIdentifiable.cs          |  0
 .../Scoping/IScopeContext.cs                  |  0
 src/Umbraco.Core/Umbraco.Core.csproj          | 83 +++++++------------
 24 files changed, 33 insertions(+), 56 deletions(-)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Dictionary/ICultureDictionary.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Dictionary/ICultureDictionaryFactory.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/ContentStatus.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/PublishedContent/Fallback.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/PublishedContent/IVariationContextAccessor.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/PublishedContent/ModelType.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/PublishedContent/PublishedCultureInfos.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/PublishedContent/PublishedDataType.cs (95%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/PublishedContent/PublishedItemType.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/PublishedContent/ThreadCultureVariationContextAccessor.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/PublishedContent/VariationContext.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/Relation.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/RelationType.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/Stylesheet.cs (98%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/StylesheetProperty.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/Tag.cs (96%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/TaggableObjectTypes.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/TaggedEntity.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/TaggedProperty.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/TagsStorageType.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/TemplateNode.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Scoping/IInstanceIdentifiable.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Scoping/IScopeContext.cs (100%)

diff --git a/src/Umbraco.Core/Dictionary/ICultureDictionary.cs b/src/Umbraco.Abstractions/Dictionary/ICultureDictionary.cs
similarity index 100%
rename from src/Umbraco.Core/Dictionary/ICultureDictionary.cs
rename to src/Umbraco.Abstractions/Dictionary/ICultureDictionary.cs
diff --git a/src/Umbraco.Core/Dictionary/ICultureDictionaryFactory.cs b/src/Umbraco.Abstractions/Dictionary/ICultureDictionaryFactory.cs
similarity index 100%
rename from src/Umbraco.Core/Dictionary/ICultureDictionaryFactory.cs
rename to src/Umbraco.Abstractions/Dictionary/ICultureDictionaryFactory.cs
diff --git a/src/Umbraco.Core/Models/ContentStatus.cs b/src/Umbraco.Abstractions/Models/ContentStatus.cs
similarity index 100%
rename from src/Umbraco.Core/Models/ContentStatus.cs
rename to src/Umbraco.Abstractions/Models/ContentStatus.cs
diff --git a/src/Umbraco.Core/Models/PublishedContent/Fallback.cs b/src/Umbraco.Abstractions/Models/PublishedContent/Fallback.cs
similarity index 100%
rename from src/Umbraco.Core/Models/PublishedContent/Fallback.cs
rename to src/Umbraco.Abstractions/Models/PublishedContent/Fallback.cs
diff --git a/src/Umbraco.Core/Models/PublishedContent/IVariationContextAccessor.cs b/src/Umbraco.Abstractions/Models/PublishedContent/IVariationContextAccessor.cs
similarity index 100%
rename from src/Umbraco.Core/Models/PublishedContent/IVariationContextAccessor.cs
rename to src/Umbraco.Abstractions/Models/PublishedContent/IVariationContextAccessor.cs
diff --git a/src/Umbraco.Core/Models/PublishedContent/ModelType.cs b/src/Umbraco.Abstractions/Models/PublishedContent/ModelType.cs
similarity index 100%
rename from src/Umbraco.Core/Models/PublishedContent/ModelType.cs
rename to src/Umbraco.Abstractions/Models/PublishedContent/ModelType.cs
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedCultureInfos.cs b/src/Umbraco.Abstractions/Models/PublishedContent/PublishedCultureInfos.cs
similarity index 100%
rename from src/Umbraco.Core/Models/PublishedContent/PublishedCultureInfos.cs
rename to src/Umbraco.Abstractions/Models/PublishedContent/PublishedCultureInfos.cs
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedDataType.cs b/src/Umbraco.Abstractions/Models/PublishedContent/PublishedDataType.cs
similarity index 95%
rename from src/Umbraco.Core/Models/PublishedContent/PublishedDataType.cs
rename to src/Umbraco.Abstractions/Models/PublishedContent/PublishedDataType.cs
index 566319ab74..5f8ec3d335 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedDataType.cs
+++ b/src/Umbraco.Abstractions/Models/PublishedContent/PublishedDataType.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Core.Models.PublishedContent
         /// <summary>
         /// Initializes a new instance of the <see cref="PublishedDataType"/> class.
         /// </summary>
-        internal PublishedDataType(int id, string editorAlias, Lazy<object> lazyConfiguration)
+        public PublishedDataType(int id, string editorAlias, Lazy<object> lazyConfiguration)
         {
             _lazyConfiguration = lazyConfiguration;
 
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs b/src/Umbraco.Abstractions/Models/PublishedContent/PublishedItemType.cs
similarity index 100%
rename from src/Umbraco.Core/Models/PublishedContent/PublishedItemType.cs
rename to src/Umbraco.Abstractions/Models/PublishedContent/PublishedItemType.cs
diff --git a/src/Umbraco.Core/Models/PublishedContent/ThreadCultureVariationContextAccessor.cs b/src/Umbraco.Abstractions/Models/PublishedContent/ThreadCultureVariationContextAccessor.cs
similarity index 100%
rename from src/Umbraco.Core/Models/PublishedContent/ThreadCultureVariationContextAccessor.cs
rename to src/Umbraco.Abstractions/Models/PublishedContent/ThreadCultureVariationContextAccessor.cs
diff --git a/src/Umbraco.Core/Models/PublishedContent/VariationContext.cs b/src/Umbraco.Abstractions/Models/PublishedContent/VariationContext.cs
similarity index 100%
rename from src/Umbraco.Core/Models/PublishedContent/VariationContext.cs
rename to src/Umbraco.Abstractions/Models/PublishedContent/VariationContext.cs
diff --git a/src/Umbraco.Core/Models/Relation.cs b/src/Umbraco.Abstractions/Models/Relation.cs
similarity index 100%
rename from src/Umbraco.Core/Models/Relation.cs
rename to src/Umbraco.Abstractions/Models/Relation.cs
diff --git a/src/Umbraco.Core/Models/RelationType.cs b/src/Umbraco.Abstractions/Models/RelationType.cs
similarity index 100%
rename from src/Umbraco.Core/Models/RelationType.cs
rename to src/Umbraco.Abstractions/Models/RelationType.cs
diff --git a/src/Umbraco.Core/Models/Stylesheet.cs b/src/Umbraco.Abstractions/Models/Stylesheet.cs
similarity index 98%
rename from src/Umbraco.Core/Models/Stylesheet.cs
rename to src/Umbraco.Abstractions/Models/Stylesheet.cs
index 19b97044bd..df5786a340 100644
--- a/src/Umbraco.Core/Models/Stylesheet.cs
+++ b/src/Umbraco.Abstractions/Models/Stylesheet.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Models
             : this(path, null)
         { }
 
-        internal Stylesheet(string path, Func<File, string> getFileContent)
+        public Stylesheet(string path, Func<File, string> getFileContent)
             : base(string.IsNullOrEmpty(path) ? path : path.EnsureEndsWith(".css"), getFileContent)
         {
             InitializeProperties();
diff --git a/src/Umbraco.Core/Models/StylesheetProperty.cs b/src/Umbraco.Abstractions/Models/StylesheetProperty.cs
similarity index 100%
rename from src/Umbraco.Core/Models/StylesheetProperty.cs
rename to src/Umbraco.Abstractions/Models/StylesheetProperty.cs
diff --git a/src/Umbraco.Core/Models/Tag.cs b/src/Umbraco.Abstractions/Models/Tag.cs
similarity index 96%
rename from src/Umbraco.Core/Models/Tag.cs
rename to src/Umbraco.Abstractions/Models/Tag.cs
index 315904493e..2c14beb14a 100644
--- a/src/Umbraco.Core/Models/Tag.cs
+++ b/src/Umbraco.Abstractions/Models/Tag.cs
@@ -54,6 +54,6 @@ namespace Umbraco.Core.Models
         }
 
         /// <inheritdoc />
-        public int NodeCount { get; internal set; }
+        public int NodeCount { get; set; }
     }
 }
diff --git a/src/Umbraco.Core/Models/TaggableObjectTypes.cs b/src/Umbraco.Abstractions/Models/TaggableObjectTypes.cs
similarity index 100%
rename from src/Umbraco.Core/Models/TaggableObjectTypes.cs
rename to src/Umbraco.Abstractions/Models/TaggableObjectTypes.cs
diff --git a/src/Umbraco.Core/Models/TaggedEntity.cs b/src/Umbraco.Abstractions/Models/TaggedEntity.cs
similarity index 100%
rename from src/Umbraco.Core/Models/TaggedEntity.cs
rename to src/Umbraco.Abstractions/Models/TaggedEntity.cs
diff --git a/src/Umbraco.Core/Models/TaggedProperty.cs b/src/Umbraco.Abstractions/Models/TaggedProperty.cs
similarity index 100%
rename from src/Umbraco.Core/Models/TaggedProperty.cs
rename to src/Umbraco.Abstractions/Models/TaggedProperty.cs
diff --git a/src/Umbraco.Core/Models/TagsStorageType.cs b/src/Umbraco.Abstractions/Models/TagsStorageType.cs
similarity index 100%
rename from src/Umbraco.Core/Models/TagsStorageType.cs
rename to src/Umbraco.Abstractions/Models/TagsStorageType.cs
diff --git a/src/Umbraco.Core/Models/TemplateNode.cs b/src/Umbraco.Abstractions/Models/TemplateNode.cs
similarity index 100%
rename from src/Umbraco.Core/Models/TemplateNode.cs
rename to src/Umbraco.Abstractions/Models/TemplateNode.cs
diff --git a/src/Umbraco.Core/Scoping/IInstanceIdentifiable.cs b/src/Umbraco.Abstractions/Scoping/IInstanceIdentifiable.cs
similarity index 100%
rename from src/Umbraco.Core/Scoping/IInstanceIdentifiable.cs
rename to src/Umbraco.Abstractions/Scoping/IInstanceIdentifiable.cs
diff --git a/src/Umbraco.Core/Scoping/IScopeContext.cs b/src/Umbraco.Abstractions/Scoping/IScopeContext.cs
similarity index 100%
rename from src/Umbraco.Core/Scoping/IScopeContext.cs
rename to src/Umbraco.Abstractions/Scoping/IScopeContext.cs
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 03458c8e9e..5d6ca25d90 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -176,6 +176,23 @@
     <Compile Include="CompositionExtensions_FileSystems.cs" />
     <Compile Include="CompositionExtensions_Uniques.cs" />
     <Compile Include="Configuration\UmbracoVersion.cs" />
+    <Compile Include="Constants-Applications.cs" />
+    <Compile Include="Constants-AppSettings.cs" />
+    <Compile Include="Constants-Composing.cs" />
+    <Compile Include="Constants-Conventions.cs" />
+    <Compile Include="Constants-DatabaseProviders.cs" />
+    <Compile Include="Constants-DataTypes.cs" />
+    <Compile Include="Constants-DeploySelector.cs" />
+    <Compile Include="Constants-Icons.cs" />
+    <Compile Include="Constants-Indexes.cs" />
+    <Compile Include="Constants-ObjectTypes.cs" />
+    <Compile Include="Constants-PackageRepository.cs" />
+    <Compile Include="Constants-PropertyEditors.cs" />
+    <Compile Include="Constants-PropertyTypeGroups.cs" />
+    <Compile Include="Constants-Security.cs" />
+    <Compile Include="Constants-System.cs" />
+    <Compile Include="Constants-Web.cs" />
+    <Compile Include="Constants.cs" />
     <Compile Include="FactoryExtensions.cs" />
     <Compile Include="Composing\RegisterFactory.cs" />
     <Compile Include="Composing\Current.cs" />
@@ -222,6 +239,19 @@
     <Compile Include="Models\PropertyCollection.cs" />
     <Compile Include="Models\PublicAccessEntry.cs" />
     <Compile Include="Models\PublishedContent\ILivePublishedModelFactory.cs" />
+    <Compile Include="Models\PublishedContent\IndexedArrayItem.cs" />
+    <Compile Include="Models\PublishedContent\IPublishedContent.cs" />
+    <Compile Include="Models\PublishedContent\IPublishedContentTypeFactory.cs" />
+    <Compile Include="Models\PublishedContent\IPublishedElement.cs" />
+    <Compile Include="Models\PublishedContent\IPublishedModelFactory.cs" />
+    <Compile Include="Models\PublishedContent\IPublishedProperty.cs" />
+    <Compile Include="Models\PublishedContent\IPublishedValueFallback.cs" />
+    <Compile Include="Models\PublishedContent\PublishedContentType.cs" />
+    <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="Persistence\Dtos\PropertyTypeCommonDto.cs" />
     <Compile Include="Persistence\Factories\MacroFactory.cs" />
     <Compile Include="Persistence\Repositories\Implement\ContentTypeCommonRepository.cs" />
@@ -284,23 +314,6 @@
     <Compile Include="Configuration\UmbracoSettings\UmbracoSettingsSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\UrlReplacingElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\WebRoutingElement.cs" />
-    <Compile Include="Constants-Applications.cs" />
-    <Compile Include="Constants-Conventions.cs" />
-    <Compile Include="Constants-DatabaseProviders.cs" />
-    <Compile Include="Constants-DataTypes.cs" />
-    <Compile Include="Constants-Composing.cs" />
-    <Compile Include="Constants-DeploySelector.cs" />
-    <Compile Include="Constants-Icons.cs" />
-    <Compile Include="Constants-ObjectTypes.cs" />
-    <Compile Include="Constants-PackageRepository.cs" />
-    <Compile Include="Constants-PropertyEditors.cs" />
-    <Compile Include="Constants-PropertyTypeGroups.cs" />
-    <Compile Include="Constants-Security.cs" />
-    <Compile Include="Constants-System.cs" />
-    <Compile Include="Constants-Indexes.cs" />
-    <Compile Include="Constants-AppSettings.cs" />
-    <Compile Include="Constants-Web.cs" />
-    <Compile Include="Constants.cs" />
     <Compile Include="RegisterExtensions.cs" />
     <Compile Include="ContentVariationExtensions.cs" />
     <Compile Include="Deploy\IDataTypeConfigurationConnector.cs" />
@@ -413,14 +426,7 @@
     <Compile Include="Models\Packaging\CompiledPackageFile.cs" />
     <Compile Include="Models\PathValidationExtensions.cs" />
     <Compile Include="Models\PropertyTagsExtensions.cs" />
-    <Compile Include="Models\PublishedContent\Fallback.cs" />
     <Compile Include="Models\PublishedContent\NoopPublishedValueFallback.cs" />
-    <Compile Include="Models\PublishedContent\PublishedCultureInfos.cs" />
-    <Compile Include="Models\PublishedContent\IVariationContextAccessor.cs" />
-    <Compile Include="Models\PublishedContent\IPublishedValueFallback.cs" />
-    <Compile Include="Models\PublishedContent\VariationContext.cs" />
-    <Compile Include="Models\PublishedContent\ThreadCultureVariationContextAccessor.cs" />
-    <Compile Include="Models\PublishedContent\VariationContextAccessorExtensions.cs" />
     <Compile Include="Models\SimpleContentType.cs" />
     <Compile Include="PackageActions\AllowDoctype.cs" />
     <Compile Include="PackageActions\PublishRootDocument.cs" />
@@ -519,8 +525,6 @@
     <Compile Include="Deploy\IUniqueIdentifyingServiceConnector.cs" />
     <Compile Include="Deploy\IValueConnector.cs" />
     <Compile Include="Diagnostics\MiniDump.cs" />
-    <Compile Include="Dictionary\ICultureDictionary.cs" />
-    <Compile Include="Dictionary\ICultureDictionaryFactory.cs" />
     <Compile Include="EmailSender.cs" />
     <Compile Include="Events\CancellableEventArgs.cs" />
     <Compile Include="Events\CancellableObjectEventArgs.cs" />
@@ -607,7 +611,6 @@
     <Compile Include="Models\Content.cs" />
     <Compile Include="Models\ContentBase.cs" />
     <Compile Include="ContentExtensions.cs" />
-    <Compile Include="Models\ContentStatus.cs" />
     <Compile Include="Models\ContentType.cs" />
     <Compile Include="Models\ContentTypeAvailableCompositionsResult.cs" />
     <Compile Include="Models\ContentTypeAvailableCompositionsResults.cs" />
@@ -643,26 +646,14 @@
     <Compile Include="Models\PropertyGroupCollection.cs" />
     <Compile Include="Models\PropertyType.cs" />
     <Compile Include="Models\PropertyTypeCollection.cs" />
-    <Compile Include="Models\PublishedContent\IndexedArrayItem.cs" />
-    <Compile Include="Models\PublishedContent\IPublishedContent.cs" />
-    <Compile Include="Models\PublishedContent\IPublishedContentTypeFactory.cs" />
-    <Compile Include="Models\PublishedContent\IPublishedModelFactory.cs" />
-    <Compile Include="Models\PublishedContent\IPublishedElement.cs" />
-    <Compile Include="Models\PublishedContent\IPublishedProperty.cs" />
-    <Compile Include="Models\PublishedContent\ModelType.cs" />
     <Compile Include="Models\PublishedContent\NoopPublishedModelFactory.cs" />
     <Compile Include="Models\PublishedContent\PublishedContentTypeFactory.cs" />
-    <Compile Include="Models\PublishedContent\PublishedDataType.cs" />
-    <Compile Include="Models\PublishedContent\PublishedElementModel.cs" />
-    <Compile Include="Models\PublishedContent\PublishedElementWrapped.cs" />
     <Compile Include="Models\PublishedContent\PublishedContentExtensionsForModels.cs" />
     <Compile Include="Models\PublishedContent\PublishedContentModel.cs" />
     <Compile Include="Models\PublishedContent\PublishedModelAttribute.cs" />
     <Compile Include="Models\PublishedContent\PublishedModelFactory.cs" />
-    <Compile Include="Models\PublishedContent\PublishedContentType.cs" />
     <Compile Include="Models\PublishedContent\PublishedContentTypeConverter.cs" />
     <Compile Include="Models\PublishedContent\PublishedContentWrapped.cs" />
-    <Compile Include="Models\PublishedContent\PublishedItemType.cs" />
     <Compile Include="Models\PublishedContent\PublishedPropertyBase.cs" />
     <Compile Include="Models\PublishedContent\PublishedPropertyType.cs" />
     <Compile Include="Models\PublishedContent\PublishedSearchResult.cs" />
@@ -714,19 +705,7 @@
     <Compile Include="Persistence\Dtos\UserGroup2NodePermissionDto.cs" />
     <Compile Include="Persistence\Dtos\UserGroupDto.cs" />
     <Compile Include="Persistence\Dtos\UserStartNodeDto.cs" />
-    <Compile Include="Models\Relation.cs" />
-    <Compile Include="Models\RelationType.cs" />
     <Compile Include="Models\ServerRegistration.cs" />
-    <Compile Include="Models\Stylesheet.cs" />
-    <Compile Include="Models\StylesheetProperty.cs" />
-    <Compile Include="Models\Tag.cs" />
-    <Compile Include="Models\TagsStorageType.cs" />
-    <Compile Include="Models\TaggableObjectTypes.cs" />
-    <Compile Include="Models\TaggedEntity.cs" />
-    <Compile Include="Models\TaggedProperty.cs" />
-    <Compile Include="Models\Template.cs" />
-    <Compile Include="Models\TemplateNode.cs" />
-    <Compile Include="Models\TemplateOnDisk.cs" />
     <Compile Include="Models\UmbracoDomain.cs" />
     <Compile Include="Models\UmbracoObjectTypes.cs" />
     <Compile Include="Models\ObjectTypes.cs" />
@@ -1142,10 +1121,8 @@
     <Compile Include="ReflectionUtilities.cs" />
     <Compile Include="RuntimeState.cs" />
     <Compile Include="Runtime\CoreInitialComposer.cs" />
-    <Compile Include="Scoping\IInstanceIdentifiable.cs" />
     <Compile Include="Scoping\IScope.cs" />
     <Compile Include="Scoping\IScopeAccessor.cs" />
-    <Compile Include="Scoping\IScopeContext.cs" />
     <Compile Include="Scoping\IScopeProvider.cs" />
     <Compile Include="Scoping\RepositoryCacheMode.cs" />
     <Compile Include="Scoping\Scope.cs" />