From 2646a20647071b4197eab6e417c19bd30f49b918 Mon Sep 17 00:00:00 2001 From: elitsa Date: Tue, 14 Jan 2020 16:35:50 +0100 Subject: [PATCH] Moving a bunch PropertyEditors From Umbraco.Web to Umbraco.Infrastructure --- .../CheckBoxListPropertyEditor.cs | 1 - .../ColorPickerConfigurationEditor.cs | 0 .../ColorPickerPropertyEditor.cs | 1 - .../ContentPickerConfiguration.cs | 0 .../ContentPickerConfigurationEditor.cs | 0 .../ContentPickerPropertyEditor.cs | 1 - .../DateTimeConfigurationEditor.cs | 0 .../PropertyEditors/DateTimePropertyEditor.cs | 1 - .../PropertyEditors/DateTimeValidator.cs | 3 +- .../PropertyEditors/DateValueEditor.cs | 1 - .../DecimalConfigurationEditor.cs | 2 +- .../PropertyEditors/DecimalPropertyEditor.cs | 1 - .../DropDownFlexibleConfigurationEditor.cs | 0 .../DropDownFlexiblePropertyEditor.cs | 1 - .../EmailAddressConfiguration.cs | 0 .../EmailAddressConfigurationEditor.cs | 0 .../EmailAddressPropertyEditor.cs | 1 - .../PropertyEditors/GridConfiguration.cs | 0 .../ImageCropperConfigurationEditor.cs | 0 .../IntegerConfigurationEditor.cs | 0 .../PropertyEditors/IntegerPropertyEditor.cs | 1 - .../PropertyEditors/ListViewConfiguration.cs | 0 .../ListViewConfigurationEditor.cs | 0 .../PropertyEditors/ListViewPropertyEditor.cs | 1 - .../PropertyEditors/MarkdownConfiguration.cs | 0 .../MarkdownConfigurationEditor.cs | 0 .../PropertyEditors/MarkdownPropertyEditor.cs | 1 - .../PropertyEditorsComponent.cs | 2 +- .../PropertyEditors/TagConfigurationEditor.cs | 2 - .../PropertyEditors/TagsPropertyEditor.cs | 1 - .../PropertyEditors/TextAreaConfiguration.cs | 0 .../TextAreaConfigurationEditor.cs | 0 .../PropertyEditors/TextAreaPropertyEditor.cs | 1 - .../PropertyEditors/TextOnlyValueEditor.cs | 1 - .../PropertyEditors/TextboxConfiguration.cs | 0 .../TextboxConfigurationEditor.cs | 0 .../PropertyEditors/TextboxPropertyEditor.cs | 1 - .../PropertyEditors/TrueFalseConfiguration.cs | 0 .../TrueFalseConfigurationEditor.cs | 0 .../TrueFalsePropertyEditor.cs | 1 - .../UserPickerConfiguration.cs | 2 +- .../UserPickerPropertyEditor.cs | 1 - .../ValueListConfigurationEditor.cs | 2 +- src/Umbraco.Web/Umbraco.Web.csproj | 51 ------------------- 44 files changed, 5 insertions(+), 76 deletions(-) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/CheckBoxListPropertyEditor.cs (98%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/ColorPickerConfigurationEditor.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/ColorPickerPropertyEditor.cs (97%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/ContentPickerConfiguration.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/ContentPickerConfigurationEditor.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/ContentPickerPropertyEditor.cs (98%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/DateTimeConfigurationEditor.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/DateTimePropertyEditor.cs (98%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/DateTimeValidator.cs (98%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/DateValueEditor.cs (97%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/DecimalConfigurationEditor.cs (99%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/DecimalPropertyEditor.cs (98%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/DropDownFlexibleConfigurationEditor.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/DropDownFlexiblePropertyEditor.cs (98%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/EmailAddressConfiguration.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/EmailAddressConfigurationEditor.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/EmailAddressPropertyEditor.cs (98%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/GridConfiguration.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/ImageCropperConfigurationEditor.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/IntegerConfigurationEditor.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/IntegerPropertyEditor.cs (97%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/ListViewConfiguration.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/ListViewConfigurationEditor.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/ListViewPropertyEditor.cs (98%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/MarkdownConfiguration.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/MarkdownConfigurationEditor.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/MarkdownPropertyEditor.cs (97%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/PropertyEditorsComponent.cs (97%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/TagConfigurationEditor.cs (97%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/TagsPropertyEditor.cs (99%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/TextAreaConfiguration.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/TextAreaConfigurationEditor.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/TextAreaPropertyEditor.cs (98%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/TextOnlyValueEditor.cs (98%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/TextboxConfiguration.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/TextboxConfigurationEditor.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/TextboxPropertyEditor.cs (98%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/TrueFalseConfiguration.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/TrueFalseConfigurationEditor.cs (100%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/TrueFalsePropertyEditor.cs (97%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/UserPickerConfiguration.cs (99%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/UserPickerPropertyEditor.cs (97%) rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/ValueListConfigurationEditor.cs (100%) diff --git a/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/CheckBoxListPropertyEditor.cs similarity index 98% rename from src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/CheckBoxListPropertyEditor.cs index 5791b3d05a..67f3dd61cd 100644 --- a/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ColorPickerConfigurationEditor.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/ColorPickerConfigurationEditor.cs diff --git a/src/Umbraco.Web/PropertyEditors/ColorPickerPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ColorPickerPropertyEditor.cs similarity index 97% rename from src/Umbraco.Web/PropertyEditors/ColorPickerPropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/ColorPickerPropertyEditor.cs index 0b7da0054f..0f6996ddd4 100644 --- a/src/Umbraco.Web/PropertyEditors/ColorPickerPropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/ContentPickerConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/ContentPickerConfiguration.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/ContentPickerConfiguration.cs rename to src/Umbraco.Infrastructure/PropertyEditors/ContentPickerConfiguration.cs diff --git a/src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ContentPickerConfigurationEditor.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/ContentPickerConfigurationEditor.cs diff --git a/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ContentPickerPropertyEditor.cs similarity index 98% rename from src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/ContentPickerPropertyEditor.cs index 77c74b288c..4c996fd4fc 100644 --- a/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DateTimeConfigurationEditor.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/DateTimeConfigurationEditor.cs diff --git a/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DateTimePropertyEditor.cs similarity index 98% rename from src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/DateTimePropertyEditor.cs index 6656efcabc..d2a08c3a2b 100644 --- a/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/DateTimeValidator.cs b/src/Umbraco.Infrastructure/PropertyEditors/DateTimeValidator.cs similarity index 98% rename from src/Umbraco.Web/PropertyEditors/DateTimeValidator.cs rename to src/Umbraco.Infrastructure/PropertyEditors/DateTimeValidator.cs index 1000922b36..a94edb99bd 100644 --- a/src/Umbraco.Web/PropertyEditors/DateTimeValidator.cs +++ b/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 { diff --git a/src/Umbraco.Web/PropertyEditors/DateValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DateValueEditor.cs similarity index 97% rename from src/Umbraco.Web/PropertyEditors/DateValueEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/DateValueEditor.cs index 3fdb95c757..8973dd812b 100644 --- a/src/Umbraco.Web/PropertyEditors/DateValueEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/DecimalConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DecimalConfigurationEditor.cs similarity index 99% rename from src/Umbraco.Web/PropertyEditors/DecimalConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/DecimalConfigurationEditor.cs index 22b1123b7c..952e3557dd 100644 --- a/src/Umbraco.Web/PropertyEditors/DecimalConfigurationEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/DecimalConfigurationEditor.cs @@ -35,4 +35,4 @@ namespace Umbraco.Web.PropertyEditors }); } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DecimalPropertyEditor.cs similarity index 98% rename from src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/DecimalPropertyEditor.cs index e2f4a69f2c..e5ca56878f 100644 --- a/src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/DropDownFlexibleConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DropDownFlexibleConfigurationEditor.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/DropDownFlexibleConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/DropDownFlexibleConfigurationEditor.cs diff --git a/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DropDownFlexiblePropertyEditor.cs similarity index 98% rename from src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/DropDownFlexiblePropertyEditor.cs index 897ca63afc..73ce726257 100644 --- a/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/EmailAddressConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/EmailAddressConfiguration.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/EmailAddressConfiguration.cs rename to src/Umbraco.Infrastructure/PropertyEditors/EmailAddressConfiguration.cs diff --git a/src/Umbraco.Web/PropertyEditors/EmailAddressConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/EmailAddressConfigurationEditor.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/EmailAddressConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/EmailAddressConfigurationEditor.cs diff --git a/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/EmailAddressPropertyEditor.cs similarity index 98% rename from src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/EmailAddressPropertyEditor.cs index 675febf9c5..c5bcaf0f86 100644 --- a/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/GridConfiguration.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/GridConfiguration.cs rename to src/Umbraco.Infrastructure/PropertyEditors/GridConfiguration.cs diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperConfigurationEditor.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/ImageCropperConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/ImageCropperConfigurationEditor.cs diff --git a/src/Umbraco.Web/PropertyEditors/IntegerConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/IntegerConfigurationEditor.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/IntegerConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/IntegerConfigurationEditor.cs diff --git a/src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/IntegerPropertyEditor.cs similarity index 97% rename from src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/IntegerPropertyEditor.cs index 4e54200d5e..49e49e005a 100644 --- a/src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/ListViewConfiguration.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs rename to src/Umbraco.Infrastructure/PropertyEditors/ListViewConfiguration.cs diff --git a/src/Umbraco.Web/PropertyEditors/ListViewConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ListViewConfigurationEditor.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/ListViewConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/ListViewConfigurationEditor.cs diff --git a/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ListViewPropertyEditor.cs similarity index 98% rename from src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/ListViewPropertyEditor.cs index 9dbd51be66..f46743f0cc 100644 --- a/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/MarkdownConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/MarkdownConfiguration.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/MarkdownConfiguration.cs rename to src/Umbraco.Infrastructure/PropertyEditors/MarkdownConfiguration.cs diff --git a/src/Umbraco.Web/PropertyEditors/MarkdownConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MarkdownConfigurationEditor.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/MarkdownConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/MarkdownConfigurationEditor.cs diff --git a/src/Umbraco.Web/PropertyEditors/MarkdownPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MarkdownPropertyEditor.cs similarity index 97% rename from src/Umbraco.Web/PropertyEditors/MarkdownPropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/MarkdownPropertyEditor.cs index b875670023..167b05df53 100644 --- a/src/Umbraco.Web/PropertyEditors/MarkdownPropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs b/src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComponent.cs similarity index 97% rename from src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs rename to src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComponent.cs index df603d9e88..de071d1a1e 100644 --- a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TagConfigurationEditor.cs similarity index 97% rename from src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/TagConfigurationEditor.cs index aed32f10a1..3877611a68 100644 --- a/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TagsPropertyEditor.cs similarity index 99% rename from src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/TagsPropertyEditor.cs index a80723e340..7fccd3a15f 100644 --- a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/TextAreaConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/TextAreaConfiguration.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/TextAreaConfiguration.cs rename to src/Umbraco.Infrastructure/PropertyEditors/TextAreaConfiguration.cs diff --git a/src/Umbraco.Web/PropertyEditors/TextAreaConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TextAreaConfigurationEditor.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/TextAreaConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/TextAreaConfigurationEditor.cs diff --git a/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TextAreaPropertyEditor.cs similarity index 98% rename from src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/TextAreaPropertyEditor.cs index c91788b99b..dd3c1fd350 100644 --- a/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/TextOnlyValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TextOnlyValueEditor.cs similarity index 98% rename from src/Umbraco.Web/PropertyEditors/TextOnlyValueEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/TextOnlyValueEditor.cs index e9389779fd..e53c673986 100644 --- a/src/Umbraco.Web/PropertyEditors/TextOnlyValueEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/TextboxConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/TextboxConfiguration.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/TextboxConfiguration.cs rename to src/Umbraco.Infrastructure/PropertyEditors/TextboxConfiguration.cs diff --git a/src/Umbraco.Web/PropertyEditors/TextboxConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TextboxConfigurationEditor.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/TextboxConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/TextboxConfigurationEditor.cs diff --git a/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TextboxPropertyEditor.cs similarity index 98% rename from src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/TextboxPropertyEditor.cs index 79d42f19d4..b89f5e228a 100644 --- a/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/TrueFalseConfiguration.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs rename to src/Umbraco.Infrastructure/PropertyEditors/TrueFalseConfiguration.cs diff --git a/src/Umbraco.Web/PropertyEditors/TrueFalseConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TrueFalseConfigurationEditor.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/TrueFalseConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/TrueFalseConfigurationEditor.cs diff --git a/src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TrueFalsePropertyEditor.cs similarity index 97% rename from src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/TrueFalsePropertyEditor.cs index 3c98b61292..3d82dc2809 100644 --- a/src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/UserPickerConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/UserPickerConfiguration.cs similarity index 99% rename from src/Umbraco.Web/PropertyEditors/UserPickerConfiguration.cs rename to src/Umbraco.Infrastructure/PropertyEditors/UserPickerConfiguration.cs index f7bd0ceb7d..4d497867a1 100644 --- a/src/Umbraco.Web/PropertyEditors/UserPickerConfiguration.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/UserPickerConfiguration.cs @@ -10,4 +10,4 @@ namespace Umbraco.Web.PropertyEditors {"entityType", "User"} }; } -} \ No newline at end of file +} diff --git a/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/UserPickerPropertyEditor.cs similarity index 97% rename from src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/UserPickerPropertyEditor.cs index 30568de0ea..429527f3eb 100644 --- a/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs +++ b/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; diff --git a/src/Umbraco.Web/PropertyEditors/ValueListConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueListConfigurationEditor.cs similarity index 100% rename from src/Umbraco.Web/PropertyEditors/ValueListConfigurationEditor.cs rename to src/Umbraco.Infrastructure/PropertyEditors/ValueListConfigurationEditor.cs index 6facc69f40..7802767ad6 100644 --- a/src/Umbraco.Web/PropertyEditors/ValueListConfigurationEditor.cs +++ b/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 { diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 0ce7127a5b..e764a0fa6c 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -446,23 +446,6 @@ - - - - - - - - - - - - - - - - - @@ -479,18 +462,8 @@ - - - - - - - - - - @@ -498,7 +471,6 @@ - @@ -630,8 +602,6 @@ - - @@ -789,12 +759,6 @@ - - - - - - @@ -814,21 +778,11 @@ - - - - - - - - - - @@ -926,12 +880,7 @@ - - - - -