Moving a bunch PropertyEditors From Umbraco.Web to Umbraco.Infrastructure

src/Umbraco.Infrastructure/PropertyEditors/CheckBoxListPropertyEditor.cs

@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;

src/Umbraco.Infrastructure/PropertyEditors/ColorPickerPropertyEditor.cs

@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;

src/Umbraco.Infrastructure/PropertyEditors/ContentPickerPropertyEditor.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Editors;

src/Umbraco.Infrastructure/PropertyEditors/DateTimePropertyEditor.cs

@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;

src/Umbraco.Infrastructure/PropertyEditors/DateTimeValidator.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
 using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {

src/Umbraco.Infrastructure/PropertyEditors/DateValueEditor.cs

@@ -1,6 +1,5 @@
 using System;
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;

src/Umbraco.Infrastructure/PropertyEditors/DecimalConfigurationEditor.cs

@@ -35,4 +35,4 @@ namespace Umbraco.Web.PropertyEditors
             });
         }
     }
-}
+}

src/Umbraco.Infrastructure/PropertyEditors/DecimalPropertyEditor.cs

@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.PropertyEditors.Validators;

src/Umbraco.Infrastructure/PropertyEditors/DropDownFlexiblePropertyEditor.cs

@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;

src/Umbraco.Infrastructure/PropertyEditors/EmailAddressPropertyEditor.cs

@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;

src/Umbraco.Infrastructure/PropertyEditors/IntegerPropertyEditor.cs

@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.PropertyEditors.Validators;

src/Umbraco.Infrastructure/PropertyEditors/ListViewPropertyEditor.cs

@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;

src/Umbraco.Infrastructure/PropertyEditors/MarkdownPropertyEditor.cs

@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;

src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComponent.cs

@@ -6,7 +6,7 @@ using Umbraco.Core.Services.Implement;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    internal sealed class PropertyEditorsComponent : IComponent
+    public sealed class PropertyEditorsComponent : IComponent
     {
         private readonly PropertyEditorCollection _propertyEditors;
 

src/Umbraco.Infrastructure/PropertyEditors/TagConfigurationEditor.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;

src/Umbraco.Infrastructure/PropertyEditors/TagsPropertyEditor.cs

@@ -4,7 +4,6 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Editors;

src/Umbraco.Infrastructure/PropertyEditors/TextAreaPropertyEditor.cs

@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;

src/Umbraco.Infrastructure/PropertyEditors/TextOnlyValueEditor.cs

@@ -1,5 +1,4 @@
 using System;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;

src/Umbraco.Infrastructure/PropertyEditors/TextboxPropertyEditor.cs

@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;

src/Umbraco.Infrastructure/PropertyEditors/TrueFalsePropertyEditor.cs

@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;

src/Umbraco.Infrastructure/PropertyEditors/UserPickerConfiguration.cs

@@ -10,4 +10,4 @@ namespace Umbraco.Web.PropertyEditors
             {"entityType", "User"}
         };
     }
-}
+}

src/Umbraco.Infrastructure/PropertyEditors/UserPickerPropertyEditor.cs

@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;

src/Umbraco.Infrastructure/PropertyEditors/ValueListConfigurationEditor.cs

@@ -2,8 +2,8 @@
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core.IO;
-using Umbraco.Core.Services;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Web.PropertyEditors
 {

src/Umbraco.Web/Umbraco.Web.csproj

@@ -446,23 +446,6 @@
     <Compile Include="Mvc\FilteredControllerFactoryCollection.cs" />
     <Compile Include="Mvc\FilteredControllerFactoryCollectionBuilder.cs" />
     <Compile Include="Mvc\SurfaceControllerTypeCollection.cs" />
-    <Compile Include="PropertyEditors\ContentPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ContentPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\ContentPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\DateValueEditor.cs" />
-    <Compile Include="PropertyEditors\DecimalConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownFlexiblePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownFlexibleConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\EmailAddressConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\EmailAddressConfiguration.cs" />
-    <Compile Include="PropertyEditors\GridConfiguration.cs" />
-    <Compile Include="PropertyEditors\GridConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\ImageCropperConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\IntegerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\ListViewConfiguration.cs" />
-    <Compile Include="PropertyEditors\ListViewConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\MarkdownConfiguration.cs" />
-    <Compile Include="PropertyEditors\MarkdownConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\MediaPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\MediaPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\MediaPickerConfigurationEditor.cs" />
@@ -479,18 +462,8 @@
     <Compile Include="PropertyEditors\NestedContentController.cs" />
     <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
     <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorsComponent.cs" />
     <Compile Include="PropertyEditors\RichTextConfiguration.cs" />
     <Compile Include="PropertyEditors\SliderConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\TagConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\TextAreaConfiguration.cs" />
-    <Compile Include="PropertyEditors\TextAreaConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\TextboxConfiguration.cs" />
-    <Compile Include="PropertyEditors\TextboxConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\TextOnlyValueEditor.cs" />
-    <Compile Include="PropertyEditors\TrueFalseConfiguration.cs" />
-    <Compile Include="PropertyEditors\TrueFalseConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\UserPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\ValueConverters\FlexibleDropdownPropertyValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\NestedContentManyValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\NestedContentValueConverterBase.cs" />
@@ -498,7 +471,6 @@
     <Compile Include="PropertyEditors\ValueConverters\MediaPickerValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\MemberPickerValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\MultiNodeTreePickerValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueListUniqueValueValidator.cs" />
     <Compile Include="PublishedCache\IPublishedSnapshot.cs" />
     <Compile Include="PublishedCache\IDefaultCultureAccessor.cs" />
     <Compile Include="PublishedCache\NuCache\DataSource\BTree.ContentDataSerializer.cs" />
@@ -630,8 +602,6 @@
     <Compile Include="Mvc\UmbracoRequireHttpsAttribute.cs" />
     <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
     <Compile Include="OwinMiddlewareConfiguredEventArgs.cs" />
-    <Compile Include="PropertyEditors\DateTimeConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\DecimalPropertyEditor.cs" />
     <Compile Include="Routing\RedirectTrackingComponent.cs" />
     <Compile Include="Editors\RedirectUrlManagementController.cs" />
     <Compile Include="Models\ContentEditing\RedirectUrlSearchResults.cs" />
@@ -789,12 +759,6 @@
     <Compile Include="Models\Mapping\TagMapDefinition.cs" />
     <Compile Include="Models\UpgradeCheckResponse.cs" />
     <Compile Include="Models\PasswordChangedModel.cs" />
-    <Compile Include="PropertyEditors\ColorPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\EmailAddressPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ImageCropperPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ImageCropperPropertyValueEditor.cs" />
-    <Compile Include="PropertyEditors\ListViewPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MarkdownPropertyEditor.cs" />
     <Compile Include="PropertyEditors\MemberGroupPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\ParameterEditors\ContentTypeParameterEditor.cs" />
     <Compile Include="PropertyEditors\ParameterEditors\MultipleContentTypeParameterEditor.cs" />
@@ -814,21 +778,11 @@
     <Compile Include="Models\ContentEditing\PropertyEditorBasic.cs" />
     <Compile Include="Models\Mapping\DataTypeMapDefinition.cs" />
     <Compile Include="Models\Mapping\EntityMapDefinition.cs" />
-    <Compile Include="PropertyEditors\CheckBoxListPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ColorPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimeValidator.cs" />
-    <Compile Include="PropertyEditors\IntegerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\MultipleTextStringPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultipleValueEditor.cs" />
     <Compile Include="PropertyEditors\RadioButtonsPropertyEditor.cs" />
     <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
     <Compile Include="PropertyEditors\RichTextConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\SliderPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TagsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\UploadFileTypeValidator.cs" />
-    <Compile Include="PropertyEditors\UserPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ValueListConfigurationEditor.cs" />
     <Compile Include="PublishedContentQuery.cs" />
     <Compile Include="ImageCropperTemplateExtensions.cs" />
     <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />
@@ -926,12 +880,7 @@
     <Compile Include="Models\Mapping\SectionMapDefinition.cs" />
     <Compile Include="Models\Mapping\TabsAndPropertiesMapper.cs" />
     <Compile Include="Models\Mapping\UserMapDefinition.cs" />
-    <Compile Include="PropertyEditors\FileUploadPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\FileUploadPropertyValueEditor.cs" />
     <Compile Include="PropertyEditors\RichTextPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextAreaPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextboxPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TrueFalsePropertyEditor.cs" />
     <Compile Include="Trees\MediaTreeController.cs" />
     <Compile Include="Models\Trees\ActionMenuItem.cs" />
     <Compile Include="Trees\ActionUrlMethod.cs" />