AB3789 - Moved some of the propertyEditor stuff

src/Umbraco.Abstractions/Models/ContentTypeBaseExtensions.cs

@@ -27,7 +27,7 @@ namespace Umbraco.Core.Models
         /// </summary>
         /// <param name="contentType"></param>
         /// <returns></returns>
-        internal static bool WasPropertyTypeVariationChanged(this IContentTypeBase contentType)
+        public static bool WasPropertyTypeVariationChanged(this IContentTypeBase contentType)
         {
             return contentType.WasPropertyTypeVariationChanged(out var _);
         }

src/Umbraco.Abstractions/PropertyEditors/ImageCropperConfiguration.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using System.Runtime.Serialization;
 
 namespace Umbraco.Core.PropertyEditors
 {
@@ -10,15 +10,16 @@ namespace Umbraco.Core.PropertyEditors
         [ConfigurationField("crops", "Define crops", "views/propertyeditors/imagecropper/imagecropper.prevalues.html")]
         public Crop[] Crops { get; set; }
 
+        [DataContract]
         public class Crop
         {
-            [JsonProperty("alias")]
+            [DataMember(Name = "alias")]
             public string Alias { get; set; }
 
-            [JsonProperty("width")]
+            [DataMember(Name = "width")]
             public int Width { get; set; }
 
-            [JsonProperty("height")]
+            [DataMember(Name = "height")]
             public int Height { get; set; }
         }
     }

src/Umbraco.Abstractions/PropertyEditors/PropertyValueConverterCollection.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.PropertyEditors

src/Umbraco.Abstractions/PropertyEditors/ValueListConfiguration.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Newtonsoft.Json;
+using System.Runtime.Serialization;
 
 namespace Umbraco.Core.PropertyEditors
 {
@@ -11,12 +11,13 @@ namespace Umbraco.Core.PropertyEditors
         [ConfigurationField("items", "Configure", "multivalues", Description = "Add, remove or sort values for the list.")]
         public List<ValueListItem> Items { get; set; } = new List<ValueListItem>();
 
+        [DataContract]
         public class ValueListItem
         {
-            [JsonProperty("id")]
+            [DataMember(Name = "id")]
             public int Id { get; set; }
 
-            [JsonProperty("value")]
+            [DataMember(Name = "value")]
             public string Value { get; set; }
         }
     }

src/Umbraco.Core/Umbraco.Core.csproj

@@ -212,8 +212,6 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\FixLanguageIsoCodeLength.cs" />
     <Compile Include="Models\CultureImpact.cs" />
     <Compile Include="Models\PublishedContent\IndexedArrayItem.cs" />
-    <Compile Include="Models\PublishedContent\IPublishedContentTypeFactory.cs" />
-    <Compile Include="Models\PublishedContent\PublishedContentType.cs" />
     <Compile Include="Models\PublishedContent\VariationContextAccessorExtensions.cs" />
     <Compile Include="Models\Template.cs" />
     <Compile Include="Models\TemplateOnDisk.cs" />
@@ -221,17 +219,25 @@
     <Compile Include="PropertyEditors\Validators\DelimitedValueValidator.cs" />
     <Compile Include="PropertyEditors\Validators\RegexValidator.cs" />
     <Compile Include="PropertyEditors\Validators\RequiredValidator.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\CheckboxListValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ColorPickerValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\GridValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValue.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueTypeConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\JsonValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\LabelValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\MarkdownEditorValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\SliderValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\TagsValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\TinyMceValueConverter.cs" />
     <Compile Include="PublishedContentExtensions.cs" />
     <Compile Include="Persistence\Dtos\PropertyTypeCommonDto.cs" />
     <Compile Include="Persistence\Factories\MacroFactory.cs" />
     <Compile Include="Persistence\Repositories\Implement\ContentTypeCommonRepository.cs" />
     <Compile Include="Persistence\Repositories\IContentTypeCommonRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\LanguageRepositoryExtensions.cs" />
-    <Compile Include="PropertyEditors\DataEditorAttribute.cs" />
-    <Compile Include="PropertyEditors\DateTimeConfiguration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RenameLabelAndRichTextPropertyEditorAliases.cs" />
-    <Compile Include="PropertyEditors\PropertyValueConverterCollection.cs" />
-    <Compile Include="PropertyEditors\PropertyValueConverterCollectionBuilder.cs" />
     <Compile Include="PropertyEditors\VoidEditor.cs" />
     <Compile Include="PublishedModelFactoryExtensions.cs" />
     <Compile Include="Serialization\JsonNetSerializer.cs" />
@@ -315,7 +321,6 @@
     <Compile Include="Migrations\Upgrade\Common\CreateKeysAndIndexes.cs" />
     <Compile Include="Models\ContentRepositoryExtensions.cs" />
     <Compile Include="Models\ContentTagsExtensions.cs" />
-    <Compile Include="Models\ContentTypeBaseExtensions.cs" />
     <Compile Include="Models\DataTypeExtensions.cs" />
     <Compile Include="Models\PathValidationExtensions.cs" />
     <Compile Include="Models\PropertyTagsExtensions.cs" />
@@ -349,23 +354,11 @@
     <Compile Include="Persistence\SqlContextExtensions.cs" />
     <Compile Include="Persistence\SqlSyntaxExtensions.cs" />
     <Compile Include="Persistence\UmbracoPocoDataBuilder.cs" />
-    <Compile Include="PropertyEditors\ColorPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\ConfigurationEditorOfTConfiguration.cs" />
     <Compile Include="PropertyEditors\ConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\DefaultPropertyIndexValueFactory.cs" />
-    <Compile Include="PropertyEditors\DropDownFlexibleConfiguration.cs" />
-    <Compile Include="PropertyEditors\ImageCropperConfiguration.cs" />
-    <Compile Include="PropertyEditors\LabelConfiguration.cs" />
     <Compile Include="PropertyEditors\LabelConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\LabelPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditorCollection.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorCollection.cs" />
     <Compile Include="PropertyEditors\PropertyEditorTagsExtensions.cs" />
-    <Compile Include="PropertyEditors\SliderConfiguration.cs" />
-    <Compile Include="PropertyEditors\TagConfiguration.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValue.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueTypeConverter.cs" />
-    <Compile Include="PropertyEditors\ValueListConfiguration.cs" />
     <Compile Include="ReflectionUtilities-Unused.cs" />
     <Compile Include="RuntimeOptions.cs" />
     <Compile Include="Runtime\CoreRuntime.cs" />
@@ -455,7 +448,6 @@
     <Compile Include="Models\PublishedContent\PublishedContentExtensionsForModels.cs" />
     <Compile Include="Models\PublishedContent\PublishedContentModel.cs" />
     <Compile Include="Models\PublishedContent\PublishedModelFactory.cs" />
-    <Compile Include="Models\PublishedContent\PublishedPropertyType.cs" />
     <Compile Include="Persistence\Dtos\AccessDto.cs" />
     <Compile Include="Persistence\Dtos\AccessRuleDto.cs" />
     <Compile Include="Persistence\Dtos\CacheInstructionDto.cs" />
@@ -801,34 +793,8 @@
     <Compile Include="Persistence\UmbracoDatabaseExtensions.cs" />
     <Compile Include="Persistence\UmbracoDatabaseFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertyEditors\DefaultPropertyValueConverterAttribute.cs" />
-    <Compile Include="PropertyEditors\IPropertyValueConverter.cs" />
     <Compile Include="PropertyEditors\DataEditor.cs" />
-    <Compile Include="PropertyEditors\DataEditorCollection.cs" />
-    <Compile Include="PropertyEditors\DataEditorCollectionBuilder.cs" />
-    <Compile Include="PropertyEditors\PropertyValueConverterBase.cs" />
     <Compile Include="PropertyEditors\DataValueEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\CheckboxListValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ColorPickerValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\DatePickerValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\DecimalValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\EmailAddressValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\GridValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\IntegerValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\JsonValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\LabelValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MarkdownEditorValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MemberGroupPickerValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MultipleTextStringValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MustBeStringValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\RadioButtonListValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\SliderValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\TagsValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\TextStringValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\TinyMceValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\UploadPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\YesNoValueConverter.cs" />
     <Compile Include="ReflectionUtilities.cs" />
     <Compile Include="RuntimeState.cs" />
     <Compile Include="Runtime\CoreInitialComposer.cs" />