From f90fc48ca8eaa3ee17640e53a394fbf39ba1d16a Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 11 Nov 2019 15:42:14 +0100
Subject: [PATCH] AB3649 - Moved IContent and ContentSchedule

---
 .../Models/ContentSchedule.cs                          |  2 +-
 .../Models/ContentScheduleAction.cs                    |  0
 .../Models/ContentScheduleCollection.cs                |  0
 .../Models/IContent.cs                                 |  0
 src/Umbraco.Core/Manifest/ManifestParser.cs            | 10 +++++++---
 src/Umbraco.Core/Umbraco.Core.csproj                   |  4 ----
 src/Umbraco.Tests/Manifest/ManifestParserTests.cs      |  3 ++-
 7 files changed, 10 insertions(+), 9 deletions(-)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/ContentSchedule.cs (98%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/ContentScheduleAction.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/ContentScheduleCollection.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Models/IContent.cs (100%)

diff --git a/src/Umbraco.Core/Models/ContentSchedule.cs b/src/Umbraco.Abstractions/Models/ContentSchedule.cs
similarity index 98%
rename from src/Umbraco.Core/Models/ContentSchedule.cs
rename to src/Umbraco.Abstractions/Models/ContentSchedule.cs
index cac4a0fd1c..4dba0456b0 100644
--- a/src/Umbraco.Core/Models/ContentSchedule.cs
+++ b/src/Umbraco.Abstractions/Models/ContentSchedule.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Core.Models
         /// Gets the unique identifier of the document targeted by the scheduled action.
         /// </summary>
         [DataMember]
-        public Guid Id { get; internal set; }
+        public Guid Id { get; set; }
 
         /// <summary>
         /// Gets the culture of the scheduled action.
diff --git a/src/Umbraco.Core/Models/ContentScheduleAction.cs b/src/Umbraco.Abstractions/Models/ContentScheduleAction.cs
similarity index 100%
rename from src/Umbraco.Core/Models/ContentScheduleAction.cs
rename to src/Umbraco.Abstractions/Models/ContentScheduleAction.cs
diff --git a/src/Umbraco.Core/Models/ContentScheduleCollection.cs b/src/Umbraco.Abstractions/Models/ContentScheduleCollection.cs
similarity index 100%
rename from src/Umbraco.Core/Models/ContentScheduleCollection.cs
rename to src/Umbraco.Abstractions/Models/ContentScheduleCollection.cs
diff --git a/src/Umbraco.Core/Models/IContent.cs b/src/Umbraco.Abstractions/Models/IContent.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IContent.cs
rename to src/Umbraco.Abstractions/Models/IContent.cs
diff --git a/src/Umbraco.Core/Manifest/ManifestParser.cs b/src/Umbraco.Core/Manifest/ManifestParser.cs
index bf70def9dc..35206b3e62 100644
--- a/src/Umbraco.Core/Manifest/ManifestParser.cs
+++ b/src/Umbraco.Core/Manifest/ManifestParser.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Exceptions;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Serialization;
 
 namespace Umbraco.Core.Manifest
 {
@@ -17,6 +18,7 @@ namespace Umbraco.Core.Manifest
     /// </summary>
     public class ManifestParser
     {
+        private readonly IJsonSerializer _jsonSerializer;
         private static readonly string Utf8Preamble = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble());
 
         private readonly IAppPolicyCache _cache;
@@ -30,9 +32,11 @@ namespace Umbraco.Core.Manifest
         /// <summary>
         /// Initializes a new instance of the <see cref="ManifestParser"/> class.
         /// </summary>
-        public ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, ManifestFilterCollection filters, ILogger logger, IIOHelper ioHelper)
+        public ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, ManifestFilterCollection filters, ILogger logger, IIOHelper ioHelper, IJsonSerializer jsonSerializer)
             : this(appCaches, validators, filters, "~/App_Plugins", logger, ioHelper)
-        { }
+        {
+            _jsonSerializer = jsonSerializer;
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ManifestParser"/> class.
@@ -198,7 +202,7 @@ namespace Umbraco.Core.Manifest
         // purely for tests
         internal IEnumerable<GridEditor> ParseGridEditors(string text)
         {
-            return JsonConvert.DeserializeObject<IEnumerable<GridEditor>>(text);
+            return _jsonSerializer.Deserialize<IEnumerable<GridEditor>>(text);
         }
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 7f51a855b3..ec6c053d7f 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -229,7 +229,6 @@
     <Compile Include="Migrations\Upgrade\V_8_0_1\ChangeNuCacheJsonFormat.cs" />
     <Compile Include="Migrations\Upgrade\V_8_1_0\ConvertTinyMceAndGridMediaUrlsToLocalLink.cs" />
     <Compile Include="Models\ContentBaseExtensions.cs" />
-    <Compile Include="Models\IContent.cs" />
     <Compile Include="Models\IContentType.cs" />
     <Compile Include="Models\IContentTypeBase.cs" />
     <Compile Include="Models\IContentTypeComposition.cs" />
@@ -425,9 +424,6 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\UserForeignKeys.cs" />
     <Compile Include="Migrations\Upgrade\Common\CreateKeysAndIndexes.cs" />
     <Compile Include="Models\ContentRepositoryExtensions.cs" />
-    <Compile Include="Models\ContentSchedule.cs" />
-    <Compile Include="Models\ContentScheduleAction.cs" />
-    <Compile Include="Models\ContentScheduleCollection.cs" />
     <Compile Include="Models\ContentTagsExtensions.cs" />
     <Compile Include="Models\ContentTypeBaseExtensions.cs" />
     <Compile Include="Models\DataTypeExtensions.cs" />
diff --git a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
index 0fcb7ac9e0..fcc7ccd79b 100644
--- a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
+++ b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
@@ -13,6 +13,7 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.PropertyEditors.Validators;
 using Umbraco.Core.Services;
 using Umbraco.Core.Dashboards;
+using Umbraco.Core.Serialization;
 
 namespace Umbraco.Tests.Manifest
 {
@@ -44,7 +45,7 @@ namespace Umbraco.Tests.Manifest
                 new RequiredValidator(Mock.Of<ILocalizedTextService>()),
                 new RegexValidator(Mock.Of<ILocalizedTextService>(), null)
             };
-            _parser = new ManifestParser(AppCaches.Disabled, new ManifestValueValidatorCollection(validators), new ManifestFilterCollection(Array.Empty<IManifestFilter>()),  Mock.Of<ILogger>(), Current.IOHelper);
+            _parser = new ManifestParser(AppCaches.Disabled, new ManifestValueValidatorCollection(validators), new ManifestFilterCollection(Array.Empty<IManifestFilter>()),  Mock.Of<ILogger>(), Current.IOHelper, new JsonNetSerializer());
         }
 
         [Test]