From e9e0274ad869d7f9b4f99bb9ce62043d125f0189 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 20 Apr 2018 00:03:19 +1000
Subject: [PATCH 1/4] fixes MultipleContentPickerParameterEditor

---
 .../MultipleContentPickerParameterEditor.cs      | 16 ++++++++++------
 src/Umbraco.Web/Umbraco.Web.csproj               |  4 +++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
index 27d1076352..fa0059bf73 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
@@ -1,16 +1,20 @@
 using Umbraco.Core;
+using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors.ParameterEditors
 {
-    [ParameterEditor(Constants.PropertyEditors.MultiNodeTreePickerAlias, "Multiple Content Picker", "contentpicker")]
-    public class MultipleContentPickerParameterEditor : ParameterEditor
+    [DataEditor("multiNodeTreePicker", EditorType.MacroParameter, "Multiple Content Picker", "contentpicker")]
+    public class MultipleContentPickerParameterEditor : DataEditor
     {
-        public MultipleContentPickerParameterEditor()
+
+        public MultipleContentPickerParameterEditor(ILogger logger, EditorType type = EditorType.PropertyValue)
+            : base(logger, type)
         {
-            Configuration.Add("multiPicker", "1");
-            Configuration.Add("minNumber",0 );
-            Configuration.Add("maxNumber", 0);
+            // configure
+            DefaultConfiguration.Add("multiPicker", "1");
+            DefaultConfiguration.Add("minNumber",0 );
+            DefaultConfiguration.Add("maxNumber", 0);
         }
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0b1e4d3103..7691f294db 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -242,6 +242,7 @@
     <Compile Include="Models\ContentEditing\Language.cs" />
     <Compile Include="Models\Mapping\ActionButtonsResolver.cs" />
     <Compile Include="Models\Mapping\AuditMapperProfile.cs" />
+    <Compile Include="Models\Mapping\ContentTypeVariationsResolver.cs" />
     <Compile Include="Models\Mapping\ContextMapper.cs" />
     <Compile Include="Models\Mapping\ContentChildOfListViewResolver.cs" />
     <Compile Include="Models\Mapping\ContentUrlResolver.cs" />
@@ -263,7 +264,7 @@
     <Compile Include="Models\Mapping\RedirectUrlMapperProfile.cs" />
     <Compile Include="Models\Mapping\TemplateMapperProfile.cs" />
     <Compile Include="Models\Mapping\UserGroupDefaultPermissionsResolver.cs" />
-    <Compile Include="Models\Mapping\VariationResolver.cs" />
+    <Compile Include="Models\Mapping\ContentItemDisplayVariationResolver.cs" />
     <Compile Include="Models\RelatedLink.cs" />
     <Compile Include="Models\RelatedLinkBase.cs" />
     <Compile Include="Models\RelatedLinks.cs" />
@@ -314,6 +315,7 @@
     <Compile Include="PropertyEditors\NestedContentConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\NestedContentController.cs" />
     <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
     <Compile Include="PropertyEditors\PropertyEditorsComponent.cs" />
     <Compile Include="PropertyEditors\RelatedLinksPropertyEditor.cs" />
     <Compile Include="PropertyEditors\RelatedLinksConfiguration.cs" />

From 5d1abaa713240869194a9f72f628eeb5445e938f Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 19 Apr 2018 16:03:54 +0200
Subject: [PATCH 2/4] Import missing parameter editor from v7 merge

---
 .../MultipleContentPickerParameterEditor.cs   | 21 +++++++++++++------
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
index 27d1076352..3d0d0eb923 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
@@ -1,16 +1,25 @@
 using Umbraco.Core;
+using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors.ParameterEditors
 {
-    [ParameterEditor(Constants.PropertyEditors.MultiNodeTreePickerAlias, "Multiple Content Picker", "contentpicker")]
-    public class MultipleContentPickerParameterEditor : ParameterEditor
+    /// <summary>
+    /// Represents a parameter editor of some sort.
+    /// </summary>
+    [DataEditor(Constants.PropertyEditors.Aliases.MultiNodeTreePicker, EditorType.MacroParameter, "Multiple Content Picker", "contentpicker")]
+    public class MultipleContentPickerParameterEditor : DataEditor
     {
-        public MultipleContentPickerParameterEditor()
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultipleContentPickerParameterEditor"/> class.
+        /// </summary>
+        public MultipleContentPickerParameterEditor(ILogger logger)
+            : base(logger)
         {
-            Configuration.Add("multiPicker", "1");
-            Configuration.Add("minNumber",0 );
-            Configuration.Add("maxNumber", 0);
+            // configure
+            DefaultConfiguration.Add("multiPicker", "1");
+            DefaultConfiguration.Add("minNumber",0 );
+            DefaultConfiguration.Add("maxNumber", 0);
         }
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0b1e4d3103..0f900826a4 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -314,6 +314,7 @@
     <Compile Include="PropertyEditors\NestedContentConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\NestedContentController.cs" />
     <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
     <Compile Include="PropertyEditors\PropertyEditorsComponent.cs" />
     <Compile Include="PropertyEditors\RelatedLinksPropertyEditor.cs" />
     <Compile Include="PropertyEditors\RelatedLinksConfiguration.cs" />

From d5ebe129832cabff5e39ff329ceddb7e7978d37e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 20 Apr 2018 00:05:45 +1000
Subject: [PATCH 3/4] removes ununsed aliases

---
 src/Umbraco.Core/Constants-PropertyEditors.cs | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index 43bd381571..f6fa5a443c 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -68,12 +68,7 @@ namespace Umbraco.Core
                 /// DropDown List.
                 /// </summary>
                 public const string DropDownListFlexible = "Umbraco.DropDown.Flexible";
-
-                /// <summary>
-                /// Folder Browser.
-                /// </summary>
-                public const string FolderBrowser = "Umbraco.FolderBrowser";
-
+                
                 /// <summary>
                 /// Grid.
                 /// </summary>
@@ -193,17 +188,7 @@ namespace Umbraco.Core
                 /// Upload Field.
                 /// </summary>
                 public const string UploadField = "Umbraco.UploadField";
-
-                /// <summary>
-                /// XPatch Checkbox List.
-                /// </summary>
-                public const string XPathCheckBoxList = "Umbraco.XPathCheckBoxList";
-
-                /// <summary>
-                /// XPath DropDown List.
-                /// </summary>
-                public const string XPathDropDownList = "Umbraco.XPathDropDownList";
-
+                
                 /// <summary>
                 /// Email Address.
                 /// </summary>

From 04da7cfd20101100c6900727fc7ca11d669069c1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 20 Apr 2018 00:09:12 +1000
Subject: [PATCH 4/4] doh, fixes csproj merge

---
 src/Umbraco.Web/Umbraco.Web.csproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 7691f294db..0f900826a4 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -242,7 +242,6 @@
     <Compile Include="Models\ContentEditing\Language.cs" />
     <Compile Include="Models\Mapping\ActionButtonsResolver.cs" />
     <Compile Include="Models\Mapping\AuditMapperProfile.cs" />
-    <Compile Include="Models\Mapping\ContentTypeVariationsResolver.cs" />
     <Compile Include="Models\Mapping\ContextMapper.cs" />
     <Compile Include="Models\Mapping\ContentChildOfListViewResolver.cs" />
     <Compile Include="Models\Mapping\ContentUrlResolver.cs" />
@@ -264,7 +263,7 @@
     <Compile Include="Models\Mapping\RedirectUrlMapperProfile.cs" />
     <Compile Include="Models\Mapping\TemplateMapperProfile.cs" />
     <Compile Include="Models\Mapping\UserGroupDefaultPermissionsResolver.cs" />
-    <Compile Include="Models\Mapping\ContentItemDisplayVariationResolver.cs" />
+    <Compile Include="Models\Mapping\VariationResolver.cs" />
     <Compile Include="Models\RelatedLink.cs" />
     <Compile Include="Models\RelatedLinkBase.cs" />
     <Compile Include="Models\RelatedLinks.cs" />