Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4549-Move-models-from-web

src/Umbraco.Abstractions/PropertyEditors/MarkdownConfiguration.cs

@@ -13,4 +13,4 @@ namespace Umbraco.Web.PropertyEditors
         [ConfigurationField("defaultValue", "Default value", "textarea", Description = "If value is blank, the editor will show this")]
         public string DefaultValue { get; set; }
     }
-}
+}

src/Umbraco.Abstractions/PropertyEditors/Validators/DateTimeValidator.cs

@@ -9,7 +9,7 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Used to validate if the value is a valid date/time
     /// </summary>
-    internal class DateTimeValidator : IValueValidator
+    public class DateTimeValidator : IValueValidator
     {
         public IEnumerable<ValidationResult> Validate(object value, string valueType, object dataTypeConfiguration)
         {

src/Umbraco.Infrastructure/PropertyEditors/MediaPickerPropertyEditor.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using Umbraco.Core;
 using Umbraco.Core.IO;
-using Umbraco.Web.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Editors;
 using Umbraco.Core.PropertyEditors;
@@ -45,7 +44,7 @@ namespace Umbraco.Web.PropertyEditors
 
         protected override IDataValueEditor CreateValueEditor() => new MediaPickerPropertyValueEditor(DataTypeService, LocalizationService, LocalizedTextService, ShortStringHelper, Attribute);
 
-        internal class MediaPickerPropertyValueEditor : DataValueEditor, IDataValueReference
+        public class MediaPickerPropertyValueEditor : DataValueEditor, IDataValueReference
         {
             public MediaPickerPropertyValueEditor(IDataTypeService dataTypeService, ILocalizationService localizationService, ILocalizedTextService localizedTextService, IShortStringHelper shortStringHelper, DataEditorAttribute attribute)
                 : base(dataTypeService,localizationService, localizedTextService, shortStringHelper,attribute)
@@ -64,6 +63,4 @@ namespace Umbraco.Web.PropertyEditors
             }
         }
     }
-
-
 }

src/Umbraco.Infrastructure/PropertyEditors/MemberGroupPickerPropertyEditor.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/MemberPickerPropertyEditor.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/MultiNodePickerConfiguration.cs

@@ -1,5 +1,4 @@
-using Newtonsoft.Json.Linq;
-using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {

src/Umbraco.Infrastructure/PropertyEditors/MultiNodeTreePickerPropertyEditor.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/MultipleTextStringPropertyEditor.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.Exceptions;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;

src/Umbraco.Infrastructure/PropertyEditors/NestedContentConfigurationEditor.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Umbraco.Core.IO;
+using Umbraco.Core.IO;
 using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors

src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs

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

src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.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/ParameterEditors/MultipleContentTypeParameterEditor.cs

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

src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.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/ParameterEditors/MultiplePropertyGroupParameterEditor.cs

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

src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs

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

src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/PropertyGroupParameterEditor.cs

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

src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs

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

src/Umbraco.Infrastructure/PropertyEditors/RadioButtonsPropertyEditor.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/RichTextConfigurationEditor.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents the configuration editor for the rich text value editor.
     /// </summary>
-    internal class RichTextConfigurationEditor : ConfigurationEditor<RichTextConfiguration>
+    public class RichTextConfigurationEditor : ConfigurationEditor<RichTextConfiguration>
     {
         public RichTextConfigurationEditor(IIOHelper ioHelper) : base(ioHelper)
         {

src/Umbraco.Infrastructure/PropertyEditors/SliderPropertyEditor.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/ValueConverters/FlexibleDropdownPropertyValueConverter.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;

src/Umbraco.Web/Umbraco.Web.csproj

@@ -207,7 +207,6 @@
     <Compile Include="Net\AspNetPasswordHasher.cs" />
     <Compile Include="Net\AspNetSessionIdResolver.cs" />
     <Compile Include="Profiling\WebProfilingController.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
     <Compile Include="PropertyEditors\RichTextEditorPastedImages.cs" />
     <Compile Include="PublishedCache\NuCache\PublishedSnapshotServiceOptions.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
@@ -251,8 +250,6 @@
     <Compile Include="ViewDataExtensions.cs" />
     <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
     <Compile Include="WebApi\Filters\OnlyLocalRequestsAttribute.cs" />
-    <Compile Include="PropertyEditors\MultiUrlPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\MultiUrlPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\MultiUrlPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\MultiUrlPickerValueEditor.cs" />
     <Compile Include="PropertyEditors\ValueConverters\MultiUrlPickerValueConverter.cs" />
@@ -264,7 +261,6 @@
     <Compile Include="Services\ITreeService.cs" />
     <Compile Include="Services\ISectionService.cs" />
     <Compile Include="PropertyEditors\GridPropertyIndexValueFactory.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorsComposer.cs" />
     <Compile Include="PublishedCache\NuCache\NuCacheComposer.cs" />
     <Compile Include="Routing\RedirectTrackingComposer.cs" />
     <Compile Include="Runtime\WebInitialComposer.cs" />
@@ -406,25 +402,8 @@
     <Compile Include="Mvc\FilteredControllerFactoryCollection.cs" />
     <Compile Include="Mvc\FilteredControllerFactoryCollectionBuilder.cs" />
     <Compile Include="Mvc\SurfaceControllerTypeCollection.cs" />
-    <Compile Include="PropertyEditors\MediaPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MediaPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\MediaPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\MemberPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MemberPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\MultiNodePickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\MultiNodePickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\MultiNodePickerConfigurationTreeSource.cs" />
-    <Compile Include="PropertyEditors\MultiNodeTreePickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultipleTextStringConfiguration.cs" />
-    <Compile Include="PropertyEditors\MultipleTextStringConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\NestedContentConfiguration.cs" />
-    <Compile Include="PropertyEditors\NestedContentConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\NestedContentController.cs" />
     <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\RichTextConfiguration.cs" />
-    <Compile Include="PropertyEditors\SliderConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\FlexibleDropdownPropertyValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\NestedContentManyValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\NestedContentValueConverterBase.cs" />
     <Compile Include="PropertyEditors\ValueConverters\NestedContentSingleValueConverter.cs" />
@@ -660,6 +639,8 @@
     <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyTypeParameterEditor.cs" />
     <Compile Include="PropertyEditors\ParameterEditors\PropertyGroupParameterEditor.cs" />
     <Compile Include="PropertyEditors\ParameterEditors\PropertyTypeParameterEditor.cs" />
+    <Compile Include="Models\UpgradeCheckResponse.cs" />
+    <Compile Include="Models\PasswordChangedModel.cs" />
     <Compile Include="PropertyEditors\PropertyEditorAssetAttribute.cs" />
     <Compile Include="PropertyEditors\RteEmbedController.cs" />
     <Compile Include="Editors\EntityController.cs" />
@@ -667,11 +648,7 @@
     <Compile Include="Editors\CurrentUserController.cs" />
     <Compile Include="Models\Mapping\DataTypeMapDefinition.cs" />
     <Compile Include="Models\Mapping\EntityMapDefinition.cs" />
-    <Compile Include="PropertyEditors\MultipleTextStringPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RadioButtonsPropertyEditor.cs" />
     <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
-    <Compile Include="PropertyEditors\RichTextConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\SliderPropertyEditor.cs" />
     <Compile Include="PublishedContentQuery.cs" />
     <Compile Include="ImageCropperTemplateExtensions.cs" />
     <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />